Translation updates

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

1 files changed, 4833 insertions, 3305 deletions

diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index a9b8b18a0..76f6ef7bd 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -36,11 +36,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>Seite vor</translation>
+        <location filename="../commands/command_edit.cpp" line="991"/>
+        <source>Add weight</source>
+        <translation>Gewicht hinzufügen</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../commands/command_edit.cpp" line="993"/>
+        <source>Add weight (%n dive(s))</source>
+        <translation><numerusform>Gewicht hinzufügen (%n Tauchgang)</numerusform><numerusform>Gewicht hinzufügen (%n Tauchgänge)</numerusform></translation>
     </message>
 </context>
 <context>
@@ -52,13 +57,6 @@
         <translation>Auswahl des externen Bluetooth-Geräts</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>Erkannte Geräte</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"/>
@@ -73,6 +71,54 @@
         <translation>Beenden</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>Lokale Bluetooth-Gerätedetails</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>Name: </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>Adresse:</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 eingeschaltet</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>Ein-/ausschalten</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>Gerät auswählen:</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>Erkannte Geräte</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>
@@ -121,47 +167,6 @@
         <translation>Löschen</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>Lokale Bluetooth-Gerätedetails</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>Name: </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>Adresse:</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 eingeschaltet</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>Ein-/ausschalten</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>Gerät auswählen:</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
         <source>Name:</source>
         <translation>Name:</translation>
@@ -361,50 +366,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-Anmeldedaten</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>Passwort</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>Registrieren</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>Abbrechen</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>Anmeldeinformationen überprüfen...</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="127"/>
         <source>Sign-in or Register</source>
         <translation>Anmelden oder Registrieren</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>Kein Cloud-Modus</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="151"/>
+        <source>Forgot password?</source>
+        <translation>Passwort vergessen?</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>Bestätigung des Cloud-Kontos erforderlich, bitte PIN in Einstellungen eintragen</translation>
     </message>
@@ -600,26 +615,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>&amp;Rückgängig</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>&amp;Wiederherstellen</translation>
     </message>
+    <message>
+        <location filename="../commands/command_base.cpp" line="65"/>
+        <source>all dives</source>
+        <translation>alle Tauchgänge</translation>
+    </message>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="94"/>
+        <source>Edit %1</source>
+        <translation>Bearbeite %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>Bearbeite %1</numerusform><numerusform>Bearbeite %1 (%n Tauchgänge)</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>Tauchgang hinzufügen</translation>
     </message>
@@ -627,7 +651,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>Tauchplatz hinzufügen</translation>
     </message>
@@ -635,15 +659,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 Tauchgang hinzufügen</numerusform><numerusform>%n Tauchgänge zu Reise hinzufügen</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 Positionen anwenden</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>Tauchgänge automatisch gruppieren</translation>
     </message>
@@ -651,7 +683,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>neue Reise</translation>
     </message>
@@ -659,7 +691,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>%n Tauchgang löschen</numerusform><numerusform>%n Tauchgänge löschen</numerusform></translation>
     </message>
@@ -667,7 +699,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>Tauchcomputer entfernen</translation>
     </message>
@@ -675,7 +707,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>%n Tauchplätze löschen</numerusform><numerusform>%n Tauchplatz löschen</numerusform></translation>
     </message>
@@ -683,7 +715,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>Lufttemperatur</translation>
     </message>
@@ -691,15 +723,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>Oberflächendruck</translation>
     </message>
 </context>
 <context>
+    <name>Command::EditChill</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="312"/>
+        <source>chill</source>
+        <translation>Kälte</translation>
+    </message>
+</context>
+<context>
+    <name>Command::EditCurrent</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="270"/>
+        <source>current</source>
+        <translation>Strömung</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>Tiefe</translation>
     </message>
@@ -707,7 +755,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>Tauchplatz</translation>
     </message>
@@ -715,7 +763,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>Tauchplatz-Land ändern</translation>
     </message>
@@ -723,7 +771,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>Tauchplatzbeschreibung ändern</translation>
     </message>
@@ -731,7 +779,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>Tauchplatzort ändern</translation>
     </message>
@@ -739,7 +787,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>Tauchplatzname ändern</translation>
     </message>
@@ -747,7 +795,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>Tauchplatznotizen ändern</translation>
     </message>
@@ -755,7 +803,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>Tauchplatztaxonomie ändern</translation>
     </message>
@@ -763,7 +811,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>Dauer</translation>
     </message>
@@ -771,7 +819,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>Notizen</translation>
     </message>
@@ -779,7 +827,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>Bewertung</translation>
     </message>
@@ -787,15 +835,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>Anzug</translation>
     </message>
 </context>
 <context>
+    <name>Command::EditSurge</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="291"/>
+        <source>surge</source>
+        <translation>Wellengang</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>Bearbeite %1</translation>
     </message>
@@ -803,7 +859,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>Reiseziel</translation>
     </message>
@@ -811,7 +867,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>Reisenotizen</translation>
     </message>
@@ -819,7 +875,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>Sicht</translation>
     </message>
@@ -827,15 +883,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>Wassertemperatur</translation>
     </message>
 </context>
 <context>
+    <name>Command::EditWaterTypeUser</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="378"/>
+        <source>salinity</source>
+        <translation>Salzgehalt</translation>
+    </message>
+</context>
+<context>
+    <name>Command::EditWaveSize</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="249"/>
+        <source>wavesize</source>
+        <translation>Wellen-Größe</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>importiere Tauchplätze von %1</translation>
     </message>
@@ -843,7 +915,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>importiere %n Tauchgang von %1</numerusform><numerusform>importiere %n Tauchgänge von %1</numerusform></translation>
     </message>
@@ -851,7 +923,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>Tauchplätze vereinigen</translation>
     </message>
@@ -859,7 +931,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>Tauchgänge zusammenführen</translation>
     </message>
@@ -867,7 +939,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>setze als ersten Tauchcomputer</translation>
     </message>
@@ -875,7 +947,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>Unbenutzte Tauchplätze löschen</translation>
     </message>
@@ -883,7 +955,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>entferne automatisch erzeugte Reisen</translation>
     </message>
@@ -891,7 +963,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>entferne %n Tauchgang aus Reise</numerusform><numerusform>entferne %n Tauchgänge aus Reise</numerusform></translation>
     </message>
@@ -899,7 +971,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>Nummeriere %1 Tauchgang neu</numerusform><numerusform>Nummeriere %n Tauchgänge neu</numerusform></translation>
     </message>
@@ -907,7 +979,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>Zeiten von %n Tauchgang verschieben</numerusform><numerusform>Zeiten von %n Tauchgängen verschieben</numerusform></translation>
     </message>
@@ -915,7 +987,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>Nach Tauchcomputern aufteilen</translation>
     </message>
@@ -923,7 +995,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>Tauchgang aufteilen</translation>
     </message>
@@ -1064,10 +1136,16 @@
         <translation>Abbrechen</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"/>
@@ -1076,6 +1154,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"/>
@@ -1088,126 +1172,6 @@
         <translation>Grundeinstellungen</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>Öko</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>Mittel</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>Hoch</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>Englisch</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>Deutsch</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>Französisch</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>Italienisch</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"/>
@@ -1220,6 +1184,16 @@
         <translation>Seriennummer</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>Länge</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"/>
@@ -1232,146 +1206,6 @@
         <translation>Firmware-Version</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>MMTTJJ</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>TTMMJJ</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>JJMMTT</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>Sprache</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>Datumsformat</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>Helligkeit</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>Einheiten</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>Salzgehalt (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>Gerät auf die Standardeinstellungen zurücksetzen</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>Kompass Empfindlichkeit</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>Computermodell</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"/>
@@ -1384,62 +1218,22 @@
         <translation>Benutzerdefinierter Text</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>OC</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>CC</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>Zeit-/Tiefenmesser</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>Apnoe</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>Tauchmodus</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>Anzahl an Tauchgängen</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>Sicherheitsstopp anzeigen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="359"/>
@@ -1450,36 +1244,32 @@
         <translation>Abtastrate</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>Standard</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>Datumsformat</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>Rot</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/TT/JJ</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>Grün</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>TT/MM/JJ</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>Blau</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>JJ/MM/TT</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="417"/>
@@ -1492,40 +1282,16 @@
         <translation>Tauchcomputerzeit mit dem PC synchronisieren</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>Tauchmodusfarbe</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>Sicherheitsstopp anzeigen</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>Tiefe am Ende</translation>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
+        <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2580"/>
+        <source>Salinity</source>
+        <translation>Salzgehalt</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>Länge</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"/>
@@ -1538,6 +1304,14 @@
         <translation>Starttiefe</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>Tiefe am Ende</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"/>
@@ -1546,6 +1320,42 @@
         <translation>Tiefe zurücksetzen</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"/>
@@ -1556,20 +1366,6 @@
         <translation>Erweiterte Einstellungen</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>Linke Tastenempfindlichkeit</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>pO₂ immer anzeigen</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"/>
@@ -1578,6 +1374,14 @@
         <translation>Alternativer GF kann unter Wasser ausgewählt werden</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>Entsättigung</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"/>
@@ -1588,40 +1392,52 @@
         <translation>Künftige Gesamtaufstiegszeit</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>Drucksensor-Offset</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>GF niedrig</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>GF hoch</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>Entsättigung</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"/>
@@ -1644,12 +1460,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>Zeit-/Tiefenmesser</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>Apnoe</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"/>
@@ -1690,22 +1556,24 @@
         <translation>Sättigung</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>Bildschirm drehen</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>Rechte Tastenempfindlichkeit</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>GF hoch</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-Warnung</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>GF niedrig</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="838"/>
@@ -1716,10 +1584,22 @@
         <translation>Grafische Geschwindigkeitsanzeige</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 Aufstiegsrate</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"/>
@@ -1742,22 +1622,6 @@
         <translation>Dekogasverbrauch</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>Temperatursensoroffset</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"/>
@@ -1768,60 +1632,6 @@
         <translation>Gas-Einstellungen</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"/>
@@ -2048,6 +1858,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>Öko</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>Mittel</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>Hoch</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>Englisch</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>Deutsch</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>Französisch</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>Italienisch</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>MMTTJJ</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>TTMMJJ</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>JJMMTT</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>Sprache</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>Helligkeit</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>Einheiten</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>Salzgehalt (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>Gerät auf die Standardeinstellungen zurücksetzen</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>Kompass Empfindlichkeit</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>Computermodell</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>OC</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>CC</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>Tauchmodus</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>Standard</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>Rot</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>Grün</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>Blau</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>Tauchmodusfarbe</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>Linke Tastenempfindlichkeit</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>pO₂ immer anzeigen</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>Drucksensor-Offset</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"/>
@@ -2056,6 +2188,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>Bildschirm drehen</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>Rechte Tastenempfindlichkeit</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-Warnung</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 Aufstiegsrate</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>Temperatursensoroffset</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"/>
@@ -2094,30 +2274,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>Ersatz 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>Travelgasverbrauch</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>Tastenempfindlichkeit</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 Konservatismus</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>Ersatz Setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3589"/>
@@ -2138,14 +2328,6 @@
         <translation>Modell</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>Anzahl an Tauchgängen</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>
@@ -2203,20 +2385,6 @@
         <translation>Gesamtdauer</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>
@@ -2247,18 +2415,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>
@@ -2277,90 +2433,6 @@
         <translation>Zeitalarm</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/TT/JJ</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>TT/MM/JJ</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>JJ/MM/TT</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>Salzgehalt</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>Travelgasverbrauch</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>Tastenempfindlichkeit</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 Konservatismus</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>Fehler</translation>
@@ -2436,6 +2508,11 @@
         <translation>Alle Dateien</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
+        <source>Choose file for dive computer download logfile</source>
+        <translation>Wählen Sie die Datei für das Tauchcomputer-Download-Protokoll aus</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/>
         <source>Log files</source>
         <translation>Log Dateien</translation>
@@ -2455,19 +2532,6 @@
         <source>Disconnected from device</source>
         <translation>Gerät getrennt</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
-        <source>Choose file for dive computer download logfile</source>
-        <translation>Wählen Sie die Datei für das Tauchcomputer-Download-Protokoll aus</translation>
-    </message>
-</context>
-<context>
-    <name>ContextDrawer</name>
-    <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/>
-        <source>Actions</source>
-        <translation>Aktionen</translation>
-    </message>
 </context>
 <context>
     <name>CopySettings</name>
@@ -2535,149 +2599,149 @@
 <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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Work press.</source>
         <translation>Betriebsdruck</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>Anfangsdruck</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>End press.</source>
         <translation>Enddruck</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>Gaswechsel bei</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="20"/>
         <source>Bot. MOD</source>
         <translation>Grund 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>Verwenden</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="54"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="48"/>
         <source>cuft</source>
         <translation>cft</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>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="263"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Hier klicken entfernt diese Flasche.</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>Tiefe für Gaswechsel, berechnet mittels Deko-pO₂ Voreinstellung, falls nicht explizit gesetzt.</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>Berechnet mittels pO₂ Voreinstellung. Setzen der MOD verändert O₂%. &apos;*&apos;  als Wert wählt Best Mix O₂% bei maximaler Tiefe.</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>Berechnet mittels Best Mix END Voreinstellung. Setzen der MND verändert He%, &apos;*&apos; als Wert verwendet besten He-Anteil bei Maximaltiefe.</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>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</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>Tauchplatz:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="480"/>
         <source>Dive master: </source>
         <translation>Tauchgruppenführer</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>Bewertung:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="496"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="486"/>
         <source>Visibility: </source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="498"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
         <source>Notes:
 </source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="500"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
         <source>Suit: </source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
         <source>Tags: </source>
         <translation>Stichwörter: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="512"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
         <source>Cylinders:
 </source>
         <translation>Flaschen:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="510"/>
         <source>Weights:
 </source>
         <translation>Blei:
@@ -2693,33 +2757,9 @@
         <translation>Komponentenauswahl</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="140"/>
-        <source>Which components would you like to copy</source>
-        <translation>Welche Komponenten möchten Sie kopieren</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>Tauchplatz</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>Anzug</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>Sicht</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>Notizen</translation>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="52"/>
+        <source>Which components would you like to copy?</source>
+        <translation>Welche Komponenten sollen kopiert werden?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
@@ -2728,38 +2768,52 @@
         <translation>Stichwörter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divecomponentselection.ui" line="52"/>
-        <source>Which components would you like to copy?</source>
-        <translation>Welche Komponenten sollen kopiert werden?</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>Blei</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>Tauchplatz</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>Sicht</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>Flaschen</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>Tauchpartner</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>Notizen</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>Tauchgruppenleiter</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>Diese können in einen anderen Tauchgang oder als Text in einem anderen Programm eingefügt werden.</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>Tauchpartner</translation>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="142"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
@@ -2767,6 +2821,16 @@
         <source>Rating</source>
         <translation>Bewertung</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>Diese können in einen anderen Tauchgang oder als Text in einem anderen Programm eingefügt werden.</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="140"/>
+        <source>Which components would you like to copy</source>
+        <translation>Welche Komponenten möchten Sie kopieren</translation>
+    </message>
 </context>
 <context>
     <name>DiveComputerManagementDialog</name>
@@ -2814,32 +2878,57 @@
 <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>Tauchgangsdetails</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>Tauchgang aus Reise entfernen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
+        <source>Add dive to trip above</source>
+        <translation>Zur obigen Reise hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="81"/>
+        <source>Add dive to trip below</source>
+        <translation>Zur Reise darunter hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="90"/>
+        <source>Undo</source>
+        <translation>Rückgängig</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="96"/>
+        <source>Redo</source>
+        <translation>Wiederherstellen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="193"/>
         <source>Delete dive</source>
         <translation>Tauchgang löschen</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>Bearbeiten abbrechen</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>Kartenansicht</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>Änderungen speichern</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>Tauchgang bearbeiten</translation>
     </message>
@@ -2847,136 +2936,136 @@
 <context>
     <name>DiveDetailsEdit</name>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="158"/>
-        <source>Dive %1</source>
-        <translation>Tauchgang %1</translation>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="139"/>
+        <source>Dive number:</source>
+        <translation>Tauchgang Number</translation>
     </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>Position:</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>Koordinaten:</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>Momentante GPS-
 Position verwenden</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>Tiefe:</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>Dauer:</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>Lufttemp.:</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>Wassertemp.: </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>Anzug:</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>Tauchpartner:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="325"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="312"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="333"/>
         <source>Weight:</source>
         <translation>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>Flasche1:</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>Gemisch:</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>Anfangsdruck:</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>Enddruck:</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>Flasche2:</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>Flasche3:</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>Flasche4:</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>Flasche5:</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>Bewertung:</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>Sicht:</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>Notizen:</translation>
     </message>
@@ -2984,67 +3073,72 @@ Position verwenden</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>Karte</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="115"/>
+        <source>Rating:</source>
+        <translation>Bewertung:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="163"/>
+        <source>Visibility:</source>
+        <translation>Sicht:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="310"/>
         <source>No profile to show</source>
         <translation>Kein Profil vorhanden</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>Anzug:</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>Lufttemp.:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/>
-        <source>Cylinder:</source>
-        <translation>Flasche:</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>Wassertemp.: </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
-        <source>Map it</source>
-        <translation>Karte</translation>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="372"/>
+        <source>Cylinder:</source>
+        <translation>Flasche:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/>
-        <source>Rating:</source>
-        <translation>Bewertung:</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>Sicht:</translation>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="388"/>
+        <source>SAC:</source>
+        <translation>AMV:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="431"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
-        <source>Weight:</source>
-        <translation>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>Tauchpartner:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
-        <source>SAC:</source>
-        <translation>AMV:</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>Notizen</translation>
     </message>
@@ -3121,186 +3215,203 @@ Position verwenden</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>Tauchgangsliste</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="428"/>
-        <source>Cloud credentials</source>
-        <translation>Cloud-Anmeldedaten</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>Bitte warten, Tauchgangliste wird gefiltert</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="252"/>
+        <source>Remove dive %1 from trip</source>
+        <translation>Tauchgang %1 aus Reise entfernen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="560"/>
-        <source>Download dives</source>
-        <translation>Tauchgänge herunterladen</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="260"/>
+        <source>Add dive %1 to trip above</source>
+        <translation>Tauchgang %1 zur Reise darüber hinzufügen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="570"/>
-        <source>Add dive</source>
-        <translation>Tauchgang hinzufügen</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="268"/>
+        <source>Add dive %1 to trip below</source>
+        <translation>Tauchgang %1 zur Reise darunter hinzufügen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="580"/>
-        <source>Filter dives</source>
-        <translation>Tauchgänge filtern</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/>
+        <source>Delete dive</source>
+        <translation>Tauchgang löschen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/>
+        <source>Show on map</source>
+        <translation>Kartenansicht</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="291"/>
+        <source>Edit trip details</source>
+        <translation>Reise-Übersicht bearbeiten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="424"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="303"/>
+        <source>Undo</source>
+        <translation>Rückgängig</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="309"/>
+        <source>Redo</source>
+        <translation>Wiederherstellen</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>Bitte tippe den &apos;+&apos; Knopf, um einen Tauchgang hinzuzufügen (oder lade Tauchgänge von einem unterstützten Tauchcomputer</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-Anmeldedaten</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="338"/>
         <source>No dives in dive list</source>
         <translation>Keine Tauchgänge in der Tauchgangsliste.</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>(% Tauchgänge)</numerusform><numerusform>(%n Tauchgang)</numerusform></translation>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="338"/>
+        <source>Please wait, updating the dive list</source>
+        <translation>Bitte warten, Tauchgangliste wird erstellt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divelistmodel.cpp" line="110"/>
-        <source>(%L1 shown)</source>
-        <translation>(%L1 dargestellt)</translation>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="381"/>
+        <source>Fulltext</source>
+        <translation>Volltext</translation>
+    </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>Stichwörter</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="443"/>
+        <source>Download dives</source>
+        <translation>Tauchgänge herunterladen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="453"/>
+        <source>Add dive</source>
+        <translation>Tauchgang hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="463"/>
+        <source>Filter dives</source>
+        <translation>Tauchgänge filtern</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>Alle ausfalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="914"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="902"/>
         <source>Collapse all</source>
         <translation>Alle einfalten</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 einklappen</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>Tauchgäng(e) aus Reise entfernen</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>Neue Reise darüber einfügen</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>Tauchgäng(e) zur Reise darüber hinzufügen</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>Tauchgäng(e) zur Reise darunter hinzufügen</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>Reise mit der darüber verbinden</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>Reise mit der darunter verbinden</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>Tauchgäng(e) löschen</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>Tauchgäng(e) als ungültig markieren</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>Ausgewählte Tauchgänge zusammenführen</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>Tauchgänge neu nummerieren</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>Tauchzeiten verschieben</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>Ausgewählte Tauchgänge aufteilen</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>Medien aus Datei(en) laden</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>Medien aus dem Netz laden</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="987"/>
-        <source>Open media files</source>
-        <translation>Mediendatei öffnen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
-        <source>Media files</source>
-        <translation>Mediendateien</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
-        <source>Image files</source>
-        <translation>Bilddateien</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
-        <source>Video files</source>
-        <translation>Videodateien</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="993"/>
-        <source>All files</source>
-        <translation>Alle Dateien</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="1042"/>
-        <source>%1 does not appear to be an image</source>
-        <translation>%1 scheint kein Bild zu sein</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>Neuen Tauchplatz erstellen, relevante Informationen werden aus dem aktuellen Tauchgang kopiert.</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>Neuen Tauchplatz mit diesem Namen erstellen</translation>
     </message>
@@ -3320,6 +3431,50 @@ Position verwenden</translation>
         <translation>Allgemeiner 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>Auswahl</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>Ausgewählte Tauchgänge</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 Tauchgänge</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>Optionen</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>Zöllig</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>Anonymisieren</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 @@ Position verwenden</translation>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="211"/>
+        <source>Subsurface dive sites XML</source>
+        <translation>Subsurface Tauchplätze 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 @@ Position verwenden</translation>
         <translation>CSV-Tauchdetails</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="280"/>
+        <source>Dive profile</source>
+        <translation>Tauchprofil</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 @@ Position verwenden</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>Bild&amp;tiefen</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>Auswahl</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>Ausgewählte Tauchgänge</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 Tauchgänge</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>Optionen</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>Zöllig</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>Anonymisieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="211"/>
-        <source>Subsurface dive sites XML</source>
-        <translation>Subsurface Tauchplätze XML</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.ui" line="280"/>
-        <source>Dive profile</source>
-        <translation>Tauchprofil</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>Profildaten CSV</translation>
@@ -3553,7 +3664,7 @@ Position verwenden</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 @@ Position verwenden</translation>
         <translation>Sand</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>Generisches Format, welches zum Datenaustausch in diversen Taucherprogrammen verwendet wird.</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>Kommagetrennte Werte, die das Tauchprofil beschreiben</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>Durch Kommata getrennte Werte (CSV) des Taugang. Beinhaltet die meisten Tauchgangsdetauls aber keine Profilinformation.</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>Tauchdaten an die divelogs.de-Webseite senden.</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>Tauchgang zu dive-share.appspot.com hochladen.</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 der Tauchplätze, visualisiert auf einer Weltkarte.</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>Natives Subsurface-XML-Format</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 Tauchplätze XML-Format</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>Tiefe, in der das Bild aufgenommen wurde, in die Datei schreiben</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>Schreibe den Tauchgang als TeX-Makros in Datei.</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>Schreibe als LaTeX-Makros in Datei</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>Speicher Profilbild als PNG.</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>Schreibe Profildaten in eine CSV-Datei.</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>UDDF-Datei exportieren 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 Dateien</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>CSV-Datei exportieren 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 Dateien</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>Weltkarte exportieren</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 Dateien</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>Exportiere 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 Dateien</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>Exportiere Tauchplätze als Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
-        <source>TeX files</source>
-        <translation>TeX Dateien</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>CSV-Datei exportieren als</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/>
-        <source>Export world map</source>
-        <translation>Weltkarte exportieren</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
-        <source>Export Subsurface XML</source>
-        <translation>Exportiere 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>Tiefe speichern, in der das Bild aufgenommen wurde</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>Export in TeX-Datei</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 Dateien</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/>
         <source>Save profile image</source>
         <translation>Speicher Profilbild</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>Speicher Profildaten</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>HTML-Datei exportieren 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>Bitte warten, Exportiervorgang...</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>Kann Datei %s nicht öffnen</translation>
-    </message>
 </context>
 <context>
     <name>DiveLogImportDialog</name>
@@ -4047,10 +4152,10 @@ Position verwenden</translation>
         <translation>Oberflächendruck</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>Wassertyp</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="144"/>
@@ -4059,10 +4164,10 @@ Position verwenden</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>Wassertyp</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 @@ Position verwenden</translation>
     </message>
 </context>
 <context>
+    <name>DivePlannerEdit</name>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerEdit.qml" line="11"/>
+        <source>Dive planner edit</source>
+        <translation>Tauchplaner bearbeiten</translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerManager</name>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerManager.qml" line="11"/>
+        <source>Dive planner manager</source>
+        <translation>Tauchplaner Manager</translation>
+    </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>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="274"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="280"/>
         <source>cyl.</source>
         <translation>Fl.</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
         <source>Final depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
         <source>Run time</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="390"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="392"/>
         <source>Used gas</source>
         <translation>Verw. 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>Tauchmodus</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>Stopp Zeiten</translation>
     </message>
 </context>
 <context>
+    <name>DivePlannerSetup</name>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="11"/>
+        <source>Dive planner setup</source>
+        <translation>Tauchplaner einrichten</translation>
+    </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>Raten</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="50"/>
+        <source>Ascent</source>
+        <translation>Aufstieg</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="54"/>
+        <source>below 75% avg. depth</source>
+        <translation>unter 75% mittlerer Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="70"/>
+        <source>75% to 50% avg. depth</source>
+        <translation>75% bis 50% mittlerer Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="86"/>
+        <source>50% avg. depth to 6m</source>
+        <translation>50% mittlerer Tiefe bis 6m</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="102"/>
+        <source>6m to surface</source>
+        <translation>6m bis Oberfläche</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="119"/>
+        <source>Descent</source>
+        <translation>Abstieg</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="123"/>
+        <source>Surface to the bottom</source>
+        <translation>Von der Oberfläche zum Grund</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="140"/>
+        <source>Drop to first depth</source>
+        <translation>Direkter Abstieg zur ersten Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="150"/>
+        <source>Planning</source>
+        <translation>Planung</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="159"/>
+        <source>Dive mode</source>
+        <translation>Tauchmodus</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="165"/>
+        <source>Open circuit</source>
+        <translation>Offenes System</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: OC-Deko</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="180"/>
+        <source>Recreational mode</source>
+        <translation>Freizeitmodus</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="189"/>
+        <source>Reserve gas</source>
+        <translation>Reservegas</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="207"/>
+        <source>Safety stop</source>
+        <translation>Sicherheitsstopp</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="217"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann Deko</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="226"/>
+        <source>GFLow</source>
+        <translation>GF niedrig</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="243"/>
+        <source>GFHigh</source>
+        <translation>GF hoch</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="260"/>
+        <source>VPM-B deco</source>
+        <translation>VPM-B Deko</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="269"/>
+        <source>Conservatism level</source>
+        <translation>Konservativismus</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>Letzter Stopp auf ??</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="291"/>
+        <source>Plan backgas breaks</source>
+        <translation>Plane Rückengas Pausen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="300"/>
+        <source>Only switch at required stops</source>
+        <translation>Nur bei erforderlichen Stopps umschalten</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="309"/>
+        <source>Min switch time</source>
+        <translation>Min. Schaltdauer</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="325"/>
+        <source>Surface segment</source>
+        <translation>Oberflächensegment</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="343"/>
+        <source>Gas options</source>
+        <translation>Gas Optionen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="352"/>
+        <source>Bottom SAC</source>
+        <translation>Grund AMV</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="370"/>
+        <source>Deco SAC</source>
+        <translation>Deko AMV</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="388"/>
+        <source>SAC factor</source>
+        <translation>AMV Faktor</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="403"/>
+        <source>Problem solving time</source>
+        <translation>Zeit für Problemlösung</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>Grund pO₂</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="433"/>
+        <source>Deco pO2</source>
+        <translation>Deko pO₂</translation>
+    </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 narkotisch</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="474"/>
+        <source>Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="480"/>
+        <source>Display runtime</source>
+        <translation>Zeige Runtime</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="487"/>
+        <source>Display segment duration</source>
+        <translation>Zeige Segmentdauer</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="494"/>
+        <source>Display transitions in deco</source>
+        <translation>Aufstiege in der Deko anzeigen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="501"/>
+        <source>Verbatim dive plan</source>
+        <translation>Ausführlicher Tauchplan</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerSetup.qml" line="508"/>
+        <source>Display plan variations</source>
+        <translation>Planvariationen anzeigen</translation>
+    </message>
+</context>
+<context>
+    <name>DivePlannerView</name>
+    <message>
+        <location filename="../mobile-widgets/qml/DivePlannerView.qml" line="11"/>
+        <source>Dive planner view</source>
+        <translation>Tauchplaner Ansicht</translation>
+    </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>Planerpunkte</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="120"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="123"/>
         <source>Available gases</source>
         <translation>Verfügbare Gase</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="121"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="124"/>
         <source>Add cylinder</source>
         <translation>Flasche hinzufügen</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>Datenpunkt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="163"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="164"/>
         <source>Save new</source>
         <translation>Neue speichern</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 @@ Position verwenden</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>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/>
         <source>Pressure</source>
         <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/>
         <source>Color</source>
         <translation>Farbe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/>
         <source>User entered</source>
         <translation>Benutzer Eingabe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/>
         <source>Pressure S</source>
         <translation>Druck 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>Druck I</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/>
         <source>Ceiling</source>
         <translation>Auftauchgrenze</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/>
         <source>SAC</source>
         <translation>AMV</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>Umgebungsdruck</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/>
         <source>Heart rate</source>
         <translation>Pulsrate</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/>
         <source>Gradient factor</source>
         <translation>Gradientenfaktor</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>Mittlere Tiefe @ s</translation>
     </message>
@@ -4365,202 +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>Tauchplatz löschen?</translation>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="18"/>
+        <source>Dive summary</source>
+        <translation>Übersicht der Tauchgänge</translation>
     </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>%n Tauchgänge verwenden diesen Tauchplatz. Wirklich löschen?</numerusform><numerusform>%n Tauchgang verwendet diesen Tauchplatz. Wirklich löschen?</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 Monat</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="53"/>
+        <source>3 months</source>
+        <translation>3 Monate</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="54"/>
+        <source>6 months</source>
+        <translation>6 Monate</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="55"/>
+        <source>1 year</source>
+        <translation>1 Jahr</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="59"/>
+        <source>last dive:</source>
+        <translation>letzter Tauchgang:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="69"/>
+        <source>first dive:</source>
+        <translation>erster Tauchgang:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveSummary.qml" line="85"/>
+        <source>Refresh</source>
+        <translation>Neu laden</translation>
+    </message>
+</context>
+<context>
+    <name>DiveSummaryModel</name>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="67"/>
+        <source>Number of dives</source>
+        <translation>Anzahl an Tauchgängen</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="68"/>
+        <source>Time</source>
+        <translation>Zeit</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="69"/>
+        <source>Depth</source>
+        <translation>Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="70"/>
+        <source>SAC</source>
+        <translation>AMV</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="85"/>
+        <source>Total</source>
+        <translation>Gesamt</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="86"/>
+        <source>EAN dives</source>
+        <translation>Tauchgänge mit Nitrox</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="87"/>
+        <source>Deep dives (&gt; 39 m)</source>
+        <translation>Tiefe Tauchgänge (&gt; 39m)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="88"/>
+        <source>Dive plan(s)</source>
+        <translation>Tauchpläne</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="89"/>
+        <source>Total time</source>
+        <translation>Gesamtzeit</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="90"/>
+        <source>Max Time</source>
+        <translation>Max. Dauer</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="91"/>
+        <source>Avg time</source>
+        <translation>Ø Dauer</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="92"/>
+        <source>Max depth</source>
+        <translation>Max. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="93"/>
+        <source>Avg max depth</source>
+        <translation>Ø Maximaltiefe</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="94"/>
+        <source>Min SAC</source>
+        <translation>Min. AMV</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="95"/>
+        <source>Max SAC</source>
+        <translation>Max. AMV</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divesummarymodel.cpp" line="96"/>
+        <source>Avg SAC</source>
+        <translation>Ø AMV</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 Tauchgang)</numerusform><numerusform>(%n Tauchgänge)</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="76"/>
+        <source>(%L1 shown)</source>
+        <translation>(%L1 dargestellt)</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 angezeigt)</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>Bewertung</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>Tiefe(%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>Dauer</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-Pfund</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>Anzug</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>Flasche</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>AMV(%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>Stichwörter</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>Medien vor/während/nach Tauchgang</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>Tauchpartner</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>Position</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="281"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="382"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="386"/>
         <source>Temp.</source>
         <translation>Temperatur</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>AMV</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>Medien</translation>
     </message>
@@ -4568,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>ein interner Fehler ist aufgetreten</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/>
-        <source>Conversion of dive %1 to divelogs.de format failed</source>
-        <translation>Konvertierung von Tauchgang %1 in divelogs.de-Format ist fehlgeschlagen</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>Fehler beim Schreiben der ZIP-Datei: %s ZIP-Fehler %d Systemfehler %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>Fertig</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>Liste der Tauchgänge wird hochgeladen...</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>Liste der Tauchgänge herunterladen...</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>Lade %1 Tauchgänge vom Server...</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>Herunterladen beendet - %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>Problem beim Herunterladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="693"/>
-        <source>Corrupted download</source>
-        <translation>Heruntergeladene Daten sind beschädigt.</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>Das Archiv konnte nicht geöffnet werden
 %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>Keine Tauchgänge ausgewählt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="172"/>
-        <source>Stylesheet to export to divelogs.de is not found</source>
-        <translation>Stylesheet für Export zu divelogs.de nicht gefunden</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="182"/>
-        <source>Failed to create zip file for upload: %s</source>
-        <translation>Zip_Datei für Upload konnte nicht erzeugt werden: %s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="720"/>
-        <source>Upload finished</source>
-        <translation>Hochladen abgeschlossen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/>
-        <source>Upload failed</source>
-        <translation>Hochladen fehlgeschlagen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/>
-        <source>Upload successful</source>
-        <translation>Hochladen erfolgreich</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="739"/>
-        <source>Login failed</source>
-        <translation>Anmeldung fehlgeschlagen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="742"/>
-        <source>Cannot parse response</source>
-        <translation>Verstehe die Antwort nicht</translation>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="392"/>
+        <source>Corrupted download</source>
+        <translation>Heruntergeladene Daten sind beschädigt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="753"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="426"/>
         <source>Error: %1</source>
         <translation>Fehler: %1</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="435"/>
+        <source>Transferring data...</source>
+        <translation>Daten werden übertragen...</translation>
+    </message>
 </context>
 <context>
     <name>DivesiteImportDialog</name>
@@ -4764,45 +5234,45 @@ Existing Site</source>
         <translation>Garmin-Tauchcomputer finden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="375"/>
         <source>Cancel download</source>
         <translation>Herunterladen abbrechen</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>Wählen Sie die Datei für das Tauchcomputer-Download-Protokoll aus</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 Dateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="481"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="468"/>
+        <source>Warning</source>
+        <translation>Warnung</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>Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="480"/>
         <source>Choose file for dive computer binary dump file</source>
         <translation>Wählen Sie die Datei aus, in die der libdivecomputer Dump gespeichert werden soll</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 Dateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="510"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="509"/>
         <source>Retry download</source>
         <translation>Herunterladen wiederholen</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="469"/>
-        <source>Warning</source>
-        <translation>Warnung</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>Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt.</translation>
-    </message>
 </context>
 <context>
     <name>DownloadFromDiveComputer</name>
@@ -4813,54 +5283,30 @@ Existing Site</source>
         <translation>Von Tauchcomputer herunterladen</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>Gerät oder Einhängepunkt</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>Erneutes Herunterladen aller Tauchgänge erzwingen</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>Tauchcomputer</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>Heruntergeladene Tauchgänge immer bevorzugen</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>In neue Reise herunterladen</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-Protokolldatei speichern</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>Dump Datei der libdivecomputer Übertragung speichern</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>
@@ -4873,23 +5319,47 @@ Existing Site</source>
         <translation>Wählen Sie ein externes Bluetooth-Gerät aus.</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>Gerät oder Einhängepunkt</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>Hersteller</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>Tauchcomputer</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>In neue Reise herunterladen</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>Dump Datei der libdivecomputer Übertragung speichern</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>Herunterladen</translation>
@@ -4920,7 +5390,7 @@ Existing Site</source>
     </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>Abbrechen</translation>
@@ -4936,72 +5406,72 @@ Existing Site</source>
         <translation>Bluetooth ist nicht aktiviert</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>Hersteller:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="97"/>
-        <source>USB device</source>
-        <translation>USB Gerät</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>Tauchcomputer:</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> Verbindung:</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>Zuletzt benutzte Tauchcomputer:</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>Wiederholen</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>Beenden</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>Neu scannen</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>Ausgelesene Tauchgänge</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>Info:</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>erneutes Herunterladen aller Tauchgänge erzwingen</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>Bitte warten während die Tauchgänge gespeichert werden...</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="443"/>
         <source>Accept</source>
         <translation>Annehmen</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 auswählen</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>Alle abwählen</translation>
     </message>
@@ -5009,7 +5479,7 @@ Existing Site</source>
 <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>Keine neuen Tauchgänge vom Tauchcomputer heruntergeladen</translation>
     </message>
@@ -5017,15 +5487,23 @@ Existing Site</source>
 <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>Buddies</translation>
     </message>
 </context>
 <context>
+    <name>EditDive</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="1167"/>
+        <source>Edit dive [%1]</source>
+        <translation>Tauchgang bearbeiten [%1]</translation>
+    </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>Tauchgruppenführer</translation>
     </message>
@@ -5033,7 +5511,7 @@ Existing Site</source>
 <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>Tauchmodus</translation>
     </message>
@@ -5041,7 +5519,7 @@ Existing Site</source>
 <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>
@@ -5049,21 +5527,136 @@ Existing Site</source>
 <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>Tags</translation>
     </message>
 </context>
 <context>
     <name>EditTagsBase</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="659"/>
+        <source>Edit %1</source>
+        <translation>Bearbeite %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>%1 editieren (%n Tauchgänge)</numerusform><numerusform>%1 editieren</numerusform></translation>
     </message>
 </context>
 <context>
+    <name>EditWeight</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="1106"/>
+        <source>Edit weight</source>
+        <translation>Blei bearbeiten</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../commands/command_edit.cpp" line="1108"/>
+        <source>Edit weight (%n dive(s))</source>
+        <translation><numerusform>Blei bearbeiten (%n Tauchgang)</numerusform><numerusform>Blei bearbeiten (%n Tauchgänge)</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>Export</name>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="11"/>
+        <source>Export Divelog information</source>
+        <translation>Logbuchdateien exportieren</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="43"/>
+        <source>Export credentials</source>
+        <translation>Anmeldedaten</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="48"/>
+        <source>User ID</source>
+        <translation>Benutzerkennung</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="58"/>
+        <source>Password:</source>
+        <translation>Passwort:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="73"/>
+        <source>Private</source>
+        <translation>Vertraulich</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="88"/>
+        <source>Export</source>
+        <translation>Exportiere</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="107"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="139"/>
+        <source>Export Subsurface XML</source>
+        <translation>Exportiere Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="144"/>
+        <source>Subsurface native XML format.</source>
+        <translation>Natives Subsurface-XML-Format</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="148"/>
+        <source>Export Subsurface dive sites XML</source>
+        <translation>Exportiere Tauchplätze als Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="152"/>
+        <source>Subsurface dive sites native XML format.</source>
+        <translation>Subsurface Tauchplätze XML-Format</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="156"/>
+        <source>Export UDDF</source>
+        <translation>UDDF exportieren</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>Generisches Format, welches zum Datenaustausch in diversen Taucherprogrammen verwendet wird.</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="164"/>
+        <source>Upload divelogs.de</source>
+        <translation>Auf divelogs.de hochladen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="167"/>
+        <source>Send the dive data to divelogs.de website.</source>
+        <translation>Tauchdaten an die divelogs.de-Webseite senden.</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="171"/>
+        <source>Upload DiveShare</source>
+        <translation>Auf DiveShare hochladen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="174"/>
+        <source>Send the dive data to dive-share.appspot.com website.</source>
+        <translation>Tauchgang zu dive-share.appspot.com hochladen.</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="195"/>
+        <source>Anonymize</source>
+        <translation>Anonymisieren</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Export.qml" line="198"/>
+        <source>Next</source>
+        <translation>Weiter</translation>
+    </message>
+</context>
+<context>
     <name>ExtraDataModel</name>
     <message>
         <location filename="../qt-models/divecomputerextradatamodel.cpp" line="11"/>
@@ -5112,136 +5705,188 @@ Existing Site</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="41"/>
-        <source>Reset / close</source>
-        <translation>Zurücksetzen / schließen</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>Wortfragment</translation>
     </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>Wortbeginn</translation>
     </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>Exakt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="63"/>
+        <source>Suit</source>
+        <translation>Anzug</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>Bewertung</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="79"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="107"/>
+        <source>Air Temp</source>
+        <translation>Lufttemp.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="121"/>
+        <source>Equipment</source>
+        <translation>Ausrüstung</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="180"/>
         <source>Tags</source>
         <translation>Stichwörter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="103"/>
-        <source>From</source>
-        <translation>Von</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="187"/>
+        <source>Water Temp</source>
+        <translation>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="110"/>
-        <source>To</source>
-        <translation>Bis</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 von</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="127"/>
-        <source>Visibility</source>
-        <translation>Sicht</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>Mindestens einer von</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="157"/>
-        <source>Equipment</source>
-        <translation>Ausrüstung</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>Keiner von</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="173"/>
-        <source>Water Temp</source>
-        <translation>Wassertemperatur</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>Position</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="256"/>
+        <source>Planned</source>
+        <translation>Geplant</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="197"/>
-        <source>Suit</source>
-        <translation>Anzug</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="288"/>
+        <source>Location</source>
+        <translation>Position</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="204"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="295"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="211"/>
-        <source>Air Temp</source>
-        <translation>Lufttemp.</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="302"/>
+        <source>Visibility</source>
+        <translation>Sicht</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="347"/>
+        <source>Reset / close</source>
+        <translation>Zurücksetzen / schließen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="354"/>
+        <source>Rating</source>
+        <translation>Bewertung</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>Filter zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="270"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="451"/>
+        <source>From</source>
+        <translation>Von</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="503"/>
         <source>Logged</source>
         <translation>Gelogged</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="280"/>
-        <source>Planned</source>
-        <translation>Geplant</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="558"/>
+        <source>To</source>
+        <translation>Bis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="310"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="565"/>
         <source>Close filters</source>
         <translation>Filter schließen</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>Filter zurücksetzen</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="579"/>
+        <source>Fulltext</source>
+        <translation>Volltext</translation>
     </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 von</translation>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="597"/>
+        <source>Full word</source>
+        <translation>Ganzes Wort</translation>
     </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>Mindestens einer von</translation>
+        <location filename="../desktop-widgets/filterwidget2.cpp" line="284"/>
+        <source>%L1/%L2 shown</source>
+        <translation>%L1/%L2 angezeigt</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>Keiner von</translation>
+        <location filename="../desktop-widgets/filterwidget2.cpp" line="286"/>
+        <source>%L1 dives</source>
+        <translation>%L1 Tauchgänge</translation>
     </message>
     <message>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="121"/>
@@ -5253,16 +5898,6 @@ Existing Site</source>
         <source>Close and reset filters</source>
         <translation>Filter schließen und zurücksetzen</translation>
     </message>
-    <message>
-        <location filename="../desktop-widgets/filterwidget2.cpp" line="245"/>
-        <source>%L1/%L2 shown</source>
-        <translation>%L1/%L2 angezeigt</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/filterwidget2.cpp" line="248"/>
-        <source>%L1 dives</source>
-        <translation>%L1 Tauchgänge</translation>
-    </message>
 </context>
 <context>
     <name>FindMovedImagesDialog</name>
@@ -5342,30 +5977,14 @@ Existing Site</source>
     </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>Seite zurück</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>Fl.</translation>
     </message>
 </context>
 <context>
-    <name>GlobalDrawer</name>
-    <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="441"/>
-        <source>Back</source>
-        <translation>Zurück</translation>
-    </message>
-</context>
-<context>
     <name>GpsList</name>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/>
@@ -5402,6 +6021,92 @@ Existing Site</source>
     </message>
 </context>
 <context>
+    <name>ImportGPS</name>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="23"/>
+        <source>Get dive coordinates from GPS</source>
+        <translation>Tauchgang Koordinaten vom GPS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="44"/>
+        <source>Synchronise the dive and the GPS track</source>
+        <translation>Tauchgang und GPS Pfad synchronisieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="85"/>
+        <source>GPS track date </source>
+        <translation>Zeitpunkt des GPS Pfads</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="99"/>
+        <source>Dive date </source>
+        <translation>Tauchdatum</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="107"/>
+        <source>Start and end times:</source>
+        <translation>Start- und Endzeit:</translation>
+    </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>Tauchgang</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="154"/>
+        <source>Start:  </source>
+        <translation>Start:</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="179"/>
+        <source>End:  </source>
+        <translation>Ende:</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="283"/>
+        <source>International time zone correction</source>
+        <translation>Interne Zeitzonenkorrektur</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>Zeitdifferenz zwischen Ortszeit und UCT (oder GMT)? Dieser Wert wird in der Regel in ganzen Stunden angegeben (h:00):</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="374"/>
+        <location filename="../desktop-widgets/importgps.ui" line="499"/>
+        <source>h:mm</source>
+        <translation>h:mm</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="385"/>
+        <location filename="../desktop-widgets/importgps.ui" line="510"/>
+        <source>Earlier</source>
+        <translation>früher</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="393"/>
+        <location filename="../desktop-widgets/importgps.ui" line="518"/>
+        <source>Later</source>
+        <translation>später</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/importgps.ui" line="408"/>
+        <source>Equipment time settings correction</source>
+        <translation>Ausrüstung Zeiteinstellungskorrektur</translation>
+    </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>Diese Einstellung behandelt Unterschiede in den Zeiteinstellungen zwischen dem GPS und dem Tauchcomputer, der den Tauchgang aufgezeichnet hat. Stellen Sie sicher, dass das GPS-Gerät und Ihr Tauchcomputer dieselbe Ortszeit anzeigen. Wenn nicht, stellen Sie die Zeit des GPS früher oder später so ein, dass sie mit der des Tauchgangs übereinstimmt (h: min):</translation>
+    </message>
+</context>
+<context>
     <name>KMessageWidget</name>
     <message>
         <location filename="../desktop-widgets/kmessagewidget.cpp" line="92"/>
@@ -5445,32 +6150,32 @@ Existing Site</source>
 <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> (gleiche GPS-Korrektur)</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 weg</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 Tauchgang hier)</numerusform><numerusform>, %n Tauchgänge 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>(keine vorhandenen GPS-Daten, GPS-Korrektur von diesem Tauchgang hinzufügen)</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>(keine GPS-Daten)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/modeldelegates.cpp" line="513"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="491"/>
         <source>Pick site: </source>
         <translation>Tauchplatz auswählen:</translation>
     </message>
@@ -5502,51 +6207,61 @@ Existing Site</source>
         <translation>Notizen</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>Koordinaten</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>Lade Tauchgang Koordinaten von GPS Datei</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/locationinformation.ui" line="81"/>
+        <source>Use GPS file</source>
+        <translation>Benutze GPS Datei</translation>
+    </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>Umgekehrte Standortbestimmung</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>Nahegelegene Tauchplätze</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>Zeige Tauchplätze im Umkreis von:</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="199"/>
-        <source>Dive sites on same coordinates</source>
-        <translation>Tauchplätze auf denselben Koordinaten</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>Stichwörter</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>Tauchplätze auf denselben Koordinaten</translation>
+    </message>
+    <message>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="204"/>
         <source>Update location on map</source>
         <translation>Position auf der Karte aktualisieren</translation>
@@ -5555,27 +6270,27 @@ Existing Site</source>
 <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>Name</translation>
     </message>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="62"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="60"/>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="64"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="62"/>
         <source># of dives</source>
         <translation>Zahl der Tauchgänge</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>Klicken um Tauchplatz zu editieren</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>Hier klicken zum Löschen des Tauchplatzes</translation>
     </message>
@@ -5583,25 +6298,35 @@ Existing Site</source>
 <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>Fertig</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>Tauchplatzverwaltung</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>Mit aktuellem Platz zusammenführen</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="252"/>
+        <source>Select GPS file to open</source>
+        <translation>Wähle zu öffnende GPS Datei</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="254"/>
+        <source>GPS files (*.gpx *.GPX)</source>
+        <translation>GPS Dateien (*.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>Applikationslog</translation>
     </message>
@@ -5609,107 +6334,87 @@ Existing Site</source>
 <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>Formular</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>Notizen</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>Formular</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>Zeit</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>Lufttemp.</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>Tiefe</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>Wassertemp.</translation>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="147"/>
+        <source>Duration (h:mm)</source>
+        <translation>Dauer (h:mm)</translation>
     </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>Position</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>Tauchplatz bearbeiten</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>Tauchplatz bearbeiten</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>Tauchgruppenleiter</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>Tauchpartner</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>Bewertung</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>Sicht</translation>
-    </message>
-    <message>
-        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
-        <source>Suit</source>
-        <translation>Anzug</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>Stichwörter</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>Tauchmodus</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>Bewertung</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
@@ -5718,23 +6423,6 @@ Existing Site</source>
         <translation>Ausrüstung</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>Tiefe</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>Dauer</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/>
-        <source>Extra Info</source>
-        <translation>Zusatzdaten</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
         <source>Information</source>
         <translation>Information</translation>
@@ -5750,6 +6438,11 @@ Existing Site</source>
         <translation>Medien</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/>
+        <source>Extra Info</source>
+        <translation>Zusatzdaten</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="71"/>
         <source>Dive sites</source>
         <translation>Tauchplätze</translation>
@@ -5775,51 +6468,71 @@ Existing Site</source>
         <translation>Rückgängig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="735"/>
-        <source>Warning: edited %1 dives</source>
-        <translation>Achtung: %1 Tauchgänge editiert</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="221"/>
-        <source>Air temp. [%1]</source>
-        <translation>Lufttemp. [%1]</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="222"/>
-        <source>Water temp. [%1]</source>
-        <translation>Wassertemp. [%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>Mehrere Tauchgänge werden bearbeitet.</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>Dieser Tauchgang wird bearbeitet.</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>Reisenotizen</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>Reiseort</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>Änderungen verwerfen?</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>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="630"/>
+        <source>Warning: edited %1 dives</source>
+        <translation>Achtung: %1 Tauchgänge editiert</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="492"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="495"/>
+        <source>Air temp.</source>
+        <translation>Lufttemp.</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="496"/>
+        <source>Water temp.</source>
+        <translation>Wassertemp.</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="507"/>
+        <source>Visibility</source>
+        <translation>Sicht</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="510"/>
+        <source>Dive mode</source>
+        <translation>Tauchmodus</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
@@ -5860,11 +6573,6 @@ Existing Site</source>
         <translation>B&amp;earbeiten</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="620"/>
-        <source>Share on</source>
-        <translation>Teilen auf</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>
@@ -6110,20 +6818,9 @@ Existing Site</source>
         <translation>Logbücher exportieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="713"/>
-        <source>Cloud stora&amp;ge online</source>
-        <translation>Cloudspeicher 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>Deko-Information umschalten</translation>
-    </message>
-    <message>
-        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="584"/>
-        <source>Configure &amp;dive computer</source>
-        <translation>&amp;Tauchcomputer konfigurieren</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="433"/>
+        <source>Change settings on &amp;dive computer</source>
+        <translation>Einstellungen des Tauchcomputers verändern</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="444"/>
@@ -6222,23 +6919,12 @@ Existing Site</source>
         <translation>Medien umschalten</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>Suche verschobene Mediendateien</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>Gasleiste umschalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.ui" line="433"/>
-        <source>Change settings on &amp;dive computer</source>
-        <translation>Einstellungen des Tauchcomputers verändern</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>
@@ -6269,6 +6955,12 @@ Existing Site</source>
         <translation>&amp;Wiederherstellen</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>Suche verschobene Mediendateien</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>
@@ -6293,55 +6985,38 @@ Existing Site</source>
         <translation>Tauchplatzb&amp;earbeitung</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-Speicher ist 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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor eine neue Datei geöffnet wird.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
-        <source>Open file</source>
-        <translation>Datei öffnen</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="713"/>
+        <source>Cloud stora&amp;ge online</source>
+        <translation>Cloudspeicher online</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="728"/>
+        <source>Toggle deco information</source>
+        <translation>Deko-Information umschalten</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>Warnung</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>Es wird versucht, Tauchgänge mit %1min Oberflächenpause zusammenzuführen</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>Sicherungskopie der Druckvorlage erstellt</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
@@ -6362,234 +7037,272 @@ Pfad:
 Die Druckvorlagen in dieser Subsurface Version sind schreibgeschützt und sollten nicht verändert werden, da neuere Versionen von Subsurface diese überschreiben könnten.</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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor eine neue Datei geöffnet wird.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
+        <source>Open file</source>
+        <translation>Datei öffnen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1916"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor online gegangen wird</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>Änderungen speichern?</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>Es gibt ungesicherte Änderungen. Sollen diese in die Cloud gespeichert werden?
 Bei &quot;nein&quot; wird die Cloud erst beim nächsten &quot;Cloudspeicher öffnen&quot; oder &quot;In Cloud speichern&quot; synchronisiert.</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>Fehler beim Verbinden des Cloud-Speichers</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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor die Datei geschlossen wird.</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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</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>Runtimetabelle anzeigen</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>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
-        <source>multiple files</source>
-        <translation>mehrere Dateien</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1766"/>
-        <source>Open dive site file</source>
-        <translation>Öffne Tauchplatz Datei</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>Bitte zuerst die aktuelle Bearbeitung abschließen um eine neue zu 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>Jahresstatistiken</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>Logbuch Dateien</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 Dateien</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 Dateien</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 Dateien</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>Tauchplatz Dateien</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>Möchtest Du die Änderungen in der Datei %1 speichern?</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>Möchtest Sie Ihre Änderungen in der Datendatei speichern?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
-        <source>Save changes?</source>
-        <translation>Änderungen speichern?</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>Änderungen gehen verloren, wenn Du sie nicht speicherst.</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>Datei speichern unter</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>[Lokaler Zwischenspeicher für] %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-Speicher für] %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>mehrere Dateien</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1703"/>
         <source>Opening datafile from older version</source>
         <translation>Datendatei von älterer Version wird geöffnet</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>Es wurde eine Datei von einer älteren Subsurface-Version geöffnet. Wir empfehlen das Handbuch zu lesen, um die Unterschiede der neuen Version insbesondere in der Tauchplatzverwaltung kennen zu lernen.
 Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die neue Tauchplatzverwaltung anzuschauen und sicher zu stellen, dass alles richtig aussieht. </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>Logbuchdatei öffnen</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>Öffne Tauchplatz Datei</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>Bitte zuerst die aktuelle Bearbeitung abschließen um eine neue zu beginnen.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1916"/>
         <source>Contacting cloud service...</source>
         <translation>Kontaktaufnahme mit dem Cloud-Dienst...</translation>
     </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="584"/>
+        <source>Configure &amp;dive computer</source>
+        <translation>&amp;Tauchcomputer konfigurieren</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-Speicher ist online</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="620"/>
+        <source>Share on</source>
+        <translation>Teilen auf</translation>
+    </message>
 </context>
 <context>
     <name>MapPage</name>
@@ -6683,33 +7396,9 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
     </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>Seite 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>Textfeld</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>Drücken</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 Tauchgänge einfügen</numerusform><numerusform>In %n Tauchgang einfügen</numerusform></translation>
     </message>
@@ -6717,79 +7406,207 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
 <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>Letzter Stopp auf 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% mittlerer Tiefe bis 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 bis Oberfläche</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>Letzter Stopp auf 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% mittlerer Tiefe bis 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 bis Oberfläche</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>cft/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>Formular</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-Speicher</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="41"/>
+        <source>Email address</source>
+        <translation>E-Mail-Adresse</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="48"/>
+        <source>Password</source>
+        <translation>Passwort</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="55"/>
+        <source>Verification PIN</source>
+        <translation>Bestätigungs-PIN</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="62"/>
+        <source>New password</source>
+        <translation>Neues Passwort</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="97"/>
+        <source>Save Password locally?</source>
+        <translation>Passwort lokal speichern?</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.ui" line="110"/>
+        <source>To create a new cloud account:</source>
+        <translation>Um einen neuen Cloud-Account zu erzeugen:</translation>
+    </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>1) Geben Sie eine E-Mail-Adresse und ein neues Passwort ein, mit dem Subsurface das Tauchprotokoll in der Cloud initialisiert. Klicken Sie auf Übernehmen, um die oben angegebene E-Mail-Adresse und das Kennwort an den (Remote-) Cloud-Server zu senden.</translation>
+    </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>2) Der Server sendet daraufhin eine Bestätigungs-PIN an die oben angegebene E-Mail-Adresse (dies ist die einzige Gelegenheit, bei der Subsurface die oben angegebene E-Mail-Adresse verwendet). Das obige Dialogfeld enthält jetzt ein neues PIN-Textfeld, das zuvor nicht sichtbar war.</translation>
+    </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>3) Geben Sie die PIN in das entsprechende Textfeld im obigen Dialog ein (dieses Feld ist nur sichtbar, während der Server auf die Bestätigung der E-Mail-Adresse wartet). Klicken Sie erneut auf Übernehmen. Das Subsurface-Cloud-Speicherkonto wird als verifiziert markiert und der Subsurface-Cloud-Speicherdienst wird zur Verwendung initialisiert.</translation>
+    </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>Änderung verworfen. Cloud-Speicher E-Mail und Passwort dürfen nur aus Buchstaben, Zahlen und &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, und &apos;+&apos; bestehen.</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>Änderung verworfen. Cloud-Speicher E-Mail und neues Passwort dürfen nur aus Buchstaben, Zahlen und &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, und &apos;+&apos; bestehen.</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>E-Mail-Adresse und Passwort für den Cloud-Speicher können nur aus Buchstaben, Zahlen und &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, sowie &apos;+&apos; bestehen.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="113"/>
+        <source>Subsurface cloud storage (credentials verified)</source>
+        <translation>Subsurface-Cloud-Speicher (Anmeldedaten bestätigt)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="115"/>
+        <source>Subsurface cloud storage (incorrect password)</source>
+        <translation>Subsurface Cloud-Speicher (Passwort falsch)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_cloud.cpp" line="117"/>
+        <source>Subsurface cloud storage (PIN required)</source>
+        <translation>Subsurface Cloud-Speicher (PIN erforderlich)</translation>
+    </message>
+</context>
+<context>
+    <name>PreferencesDc</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.ui" line="24"/>
+        <source>DIVE COMPUTER</source>
+        <translation>Tauchcomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.ui" line="39"/>
+        <source>Delete connections</source>
+        <translation>Verbindungen löschen</translation>
+    </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>Beim Importieren von Tauchgängen von einem Tauchcomputer (TC) merkt sich Subsurface die Verbindung(en) und zeigt sie als auswählbare Schaltflächen im Download-Bereich an. Dies ist nützlich für TC, die Bluetooth für die Kommunikation verwenden. Um alle diese Informationen zu löschen, klicken Sie auf die Schaltfläche unten. Nach dem Löschen der Informationen verschwinden die Schaltflächen im Download-Bereich und es ist erforderlich, neue Verbindung(en) mit Tauchcomputer(n) herzustellen, bevor Tauchgänge erneut importiert werden.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.ui" line="61"/>
+        <source>Delete all dive computer connections</source>
+        <translation>Lösche alle Verbindungen zu Tauchcomputern</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_dc.cpp" line="13"/>
+        <source>Dive download</source>
+        <translation>Tauchcomputer auslesen</translation>
+    </message>
+</context>
+<context>
     <name>PreferencesDefaults</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="14"/>
@@ -6798,186 +7615,180 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <translation>Formular</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>Listen und Tabellen</translation>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="21"/>
+        <source>Font for lists and tables</source>
+        <translation>Schriftart für Listen und Tabellen</translation>
     </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>Schriftart</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>Schriftgröße</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>Animationen</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>Bei einigen Übergängen, etwa beim Zoomen des Tauchgangsprofils, werden die Achsen animiert. Mit welcher Geschwindigkeit soll diese Animation stattfinden (Maximum = 500):</translation>
+    </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>Geschwindigkeit</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="15"/>
+        <source>Display</source>
+        <translation>Anzeige</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="330"/>
+        <source>Lists and tables</source>
+        <translation>Listen und Tabellen</translation>
+    </message>
+    <message>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="333"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="52"/>
-        <source>Default file</source>
-        <translation>Voreingestellte Datei</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>Standard-Logbuchdatei</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>Kei&amp;ne Default-Datei</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;Lokale Standarddatei</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-Speicher-Standarddatei</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>Lokale Logbuchdatei</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>Standardeinstellungen verwenden</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>Ungültige anzeigen</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>Standardflasche</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>Standardflasche verwenden</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>Animationen</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>Geschwindigkeit</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-Standbilder</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 Programm</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>An Position extrahieren</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>Standbilder extrahieren</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>Einstellungen löschen</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>Tauchcomputer vergessen</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>Alle Einstellungen auf Standardwert setzen</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="14"/>
-        <source>General</source>
-        <translation>Allgemein</translation>
+        <location filename="../desktop-widgets/preferences/preferencesdialog.cpp" line="48"/>
+        <source>Preferences</source>
+        <translation>Einstellungen</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>Standard-Logbuchdatei öffnen</translation>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
-        <source>Subsurface files</source>
-        <translation>Subsurface Dateien</translation>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.ui" line="24"/>
+        <source>CYLINDERS</source>
+        <translation>FLASCHEN</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
-        <source>Warning</source>
-        <translation>Warnung</translation>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.ui" line="32"/>
+        <source>Default cylinder in the Cylinders table of the Equipment tab</source>
+        <translation>Standardflasche in der Flaschen-Tabelle des Ausrüstunggs-Tabs</translation>
     </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 type="unfinished"/>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.ui" line="48"/>
+        <source>Select a default cylinder</source>
+        <translation>Wähle einen Standardzylinder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="70"/>
-        <source>Select ffmpeg executable</source>
-        <translation>ffmpeg-Programm auswählen</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>Zeige unbenutzte Flaschen in der Flaschen-Tabelle des Ausrüstungs-Tabs</translation>
     </message>
-</context>
-<context>
-    <name>PreferencesDialog</name>
     <message>
-        <location filename="../desktop-widgets/preferences/preferencesdialog.cpp" line="42"/>
-        <source>Preferences</source>
-        <translation>Einstellungen</translation>
+        <location filename="../desktop-widgets/preferences/preferences_equipment.cpp" line="12"/>
+        <source>Equipment</source>
+        <translation>Ausrüstung</translation>
     </message>
 </context>
 <context>
@@ -6989,14 +7800,18 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <translation>Formular</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>Tauchplatzangaben</translation>
+        <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="24"/>
+        <source>Reverse dive site lookup format</source>
+        <translation>Umgekehrte Tauchplatz-Suche</translation>
     </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>Durch Auswahl des blauen Globussymbols rechts neben &quot;Ort&quot; auf der Registerkarte &quot;Notizen&quot; wird das Bedienfeld &quot;Tauchplatz bearbeiten&quot; geöffnet. Dort ermöglicht ein Symbol rechts neben den Tauchplatzkoordinaten die umgekehrte Suche des Tauchplatzes. Dadurch wird das Land und die nächstgelegene Stadt zum Tauchplatz gefunden und als Tauchplatz-Etiket über dem Namen des Tauchplatzes auf der Registerkarte Notizen hinzugefügt. In den folgenden Kombinationsfeldern können Sie die Reihenfolge auswählen, in der diese Etiketten auf der Registerkarte Notizen angezeigt werden. Dies erfordert eine Internetverbindung.</translation>
+    </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>
@@ -7007,6 +7822,11 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <source>Georeference</source>
         <translation>Georeferenz</translation>
     </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_georeference.h" line="106"/>
+        <source>Dive site layout</source>
+        <translation>Tauchplatzangaben</translation>
+    </message>
 </context>
 <context>
     <name>PreferencesGraph</name>
@@ -7023,66 +7843,6 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <translation>Gasdruck-Anzeigen-Einstellung</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 Einstellungen:</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>Einstellung Auftauchgrenzen</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>Auftauchgrenze des Tauchcomputers in rot zeichnen</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>Algorithmus für Auftauchgrenze</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>GF hoch</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>GF niedrig</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-Einstellungen:</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>Verdünnungsverhältnis</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>
@@ -7123,6 +7883,12 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <translation>pO₂ für MOD-Berechnung (nur 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 Einstellungen:</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>
@@ -7141,12 +7907,36 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <translation>CCR Setpoints in pO₂-Ansicht anzeigen </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-Einstellungen:</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 O₂-Umsatz</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>Verdünnungsverhältnis</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>
@@ -7159,16 +7949,16 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <translation>Zeige Warnungen bei isobarer Gegendiffusion</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>Konservativismus</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>Einstellung Auftauchgrenzen</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>Standbilder neu berechnen, wenn älter als Video</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>GF hoch</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/>
@@ -7177,10 +7967,10 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <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>Algorithmus für Auftauchgrenze</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="275"/>
@@ -7191,33 +7981,59 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <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>Konservativismus</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>Auftauchgrenze des Tauchcomputers in rot zeichnen</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>GF niedrig</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="12"/>
+        <source>Tech setup</source>
+        <translation>Tec Einstellungen</translation>
+    </message>
+    <message>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="372"/>
         <source>Misc</source>
         <translation>Sonstiges</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>Nicht benutzte Flaschen unter Ausrüstung anzeigen</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>Mittlere Tiefe im Profil anzeigen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="12"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
+        <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="375"/>
+        <source>Recalculate thumbnails if older than media file</source>
+        <translation>Standbilder neu berechnen, wenn älter als Video</translation>
     </message>
 </context>
 <context>
@@ -7253,12 +8069,6 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <translation>Datumsformat</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;Bevorzugtes Datumsformat. Gebräuchliche Felder sind &lt;/p&gt;&lt;p&gt;d (Tag im Monat)&lt;/p&gt;&lt;p&gt;ddd (Wochentagsabkürzung)&lt;/p&gt;&lt;p&gt;M (Monatszahl)&lt;/p&gt;&lt;p&gt;MMM (Abkürzung Monatsname)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4-stelliges Jahr)&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"/>
@@ -7279,6 +8089,12 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <translation>Kurzformat</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;Bevorzugtes Datumsformat. Gebräuchliche Felder sind &lt;/p&gt;&lt;p&gt;d (Tag im Monat)&lt;/p&gt;&lt;p&gt;ddd (Wochentagsabkürzung)&lt;/p&gt;&lt;p&gt;M (Monatszahl)&lt;/p&gt;&lt;p&gt;MMM (Abkürzung Monatsname)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4-stelliges Jahr)&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>
@@ -7334,6 +8150,172 @@ siehe 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>Formular</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="21"/>
+        <source>DIVE LOG</source>
+        <translation>LOGBUCH</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="44"/>
+        <source>Default dive log file</source>
+        <translation>Standard-Logbuchdatei</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="53"/>
+        <source>&amp;No default file</source>
+        <translation>Kei&amp;ne Default-Datei</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="60"/>
+        <source>&amp;Local default file</source>
+        <translation>&amp;Lokale Standarddatei</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-Speicher-Standarddatei</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="76"/>
+        <source>Local dive log file</source>
+        <translation>Lokale Logbuchdatei</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="88"/>
+        <source>Use default</source>
+        <translation>Standardeinstellungen verwenden</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>Zeige als ungültig markierte Tauchgänge in der Tauchgangsliste, etwa Pool-Tauchgänge</translation>
+    </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>Zeige die Werkzeuge um Wellenhöhe, Brandung und Wind bei einem Tauchgang zu erfassen im Informations-Tab anzuzeigen.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="127"/>
+        <source>In the Dive Profile, show mean depth</source>
+        <translation>Zeige die mittlere Tiefe im Tauchgangsprofil</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.ui" line="135"/>
+        <source>In the Information tab, allow editing of water salinity</source>
+        <translation>Im Informations-TAB, erlaube editieren des Salzgehalts des Wassers</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.cpp" line="14"/>
+        <source> Dive log</source>
+        <translation>Logbuch</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.cpp" line="27"/>
+        <source>Open default log file</source>
+        <translation>Standard-Logbuchdatei öffnen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_log.cpp" line="27"/>
+        <source>Subsurface files</source>
+        <translation>Subsurface Dateien</translation>
+    </message>
+</context>
+<context>
+    <name>PreferencesMedia</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="24"/>
+        <source>UPDATE THUMBNAILS</source>
+        <translation>VORSCHAUEN AKTUALISIEREN</translation>
+    </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>Fotos und Videos können bearbeitet sein, nachdem sie ins Logbuch eingetragen sind. Wenn ein Medium neuer ist als die Vorschau, wird mit dieser Option nach der Bearbeitung die Vorschau aktualisiert.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="46"/>
+        <source>Recalculate thumbnail if older than media file</source>
+        <translation>Vorschauen, die älter als die Mediendatei sind, aktualisieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="68"/>
+        <source>VIDEOS</source>
+        <translation>VIDEOS</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="76"/>
+        <source>Video thumbnails</source>
+        <translation>Video-Standbilder</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>Videos können durch Standbilder im Medien-Tab dargestellt werden, die mit dem externen Programm ffmpeg erzeugt werden, das auf dem Computer dafür installiert sein muss. Ein gesetztes Häkchen erlaubt das. Bitte auch den Pfad zum ffmpeg Programm in das Textfeld eintragen. Unter Linux kann das zum Beispiel /usr/bin/ffmpeg sein. Wenn ffmpeg systemweit installiert ist, reicht es ffmpeg dort einzutragen. Weitere Informationen in Anhang F der Anleitung.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="106"/>
+        <source>Extract video thumbnails</source>
+        <translation>Standbilder extrahieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="114"/>
+        <source>Path to ffmpeg:</source>
+        <translation>ffmpeg Pfad</translation>
+    </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>Relative Position des Vorschaubilds im Video kann mit dem Schieberegler eingestellt werden.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.ui" line="150"/>
+        <source>Extract at position</source>
+        <translation>An Position extrahieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.cpp" line="14"/>
+        <source>Media</source>
+        <translation>Medien</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.cpp" line="39"/>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.cpp" line="39"/>
+        <source>Couldn&apos;t execute ffmpeg at given location. Thumbnailing will not work.</source>
+        <translation>ffmpeg konnte nicht am angegebenen Pfad ausgeführt werden. Es werden keine Vorschaubilder erzeugt.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_media.cpp" line="45"/>
+        <source>Select ffmpeg executable</source>
+        <translation>ffmpeg-Programm auswählen</translation>
+    </message>
+</context>
+<context>
     <name>PreferencesNetwork</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="14"/>
@@ -7343,9 +8325,8 @@ siehe 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>Wenn der Internetzugang durch einen Proxy erfolgt, hier Proxyeinstellungen eintragen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="32"/>
@@ -7373,7 +8354,6 @@ siehe 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>
@@ -7386,91 +8366,82 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
         <translation>Anmeldung erforderlich</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>Netzwerk</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="14"/>
+        <source>No proxy</source>
+        <translation>Kein Proxy</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
+        <source>System proxy</source>
+        <translation>Systemproxy</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-Speicher</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-Mail-Adresse</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>Bestätigungs-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>Neues Passwort</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>Passwort lokal speichern?</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesReset</name>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
-        <source>Network</source>
-        <translation>Netzwerk</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
-        <source>No proxy</source>
-        <translation>Kein Proxy</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
-        <source>System proxy</source>
-        <translation>Systemproxy</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>Änderung verworfen. Cloud-Speicher E-Mail und Passwort dürfen nur aus Buchstaben, Zahlen und &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, und &apos;+&apos; bestehen.</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>Änderung verworfen. Cloud-Speicher E-Mail und neues Passwort dürfen nur aus Buchstaben, Zahlen und &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, und &apos;+&apos; bestehen.</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>E-Mail-Adresse und Passwort für den Cloud-Speicher können nur aus Buchstaben, Zahlen und &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, sowie &apos;+&apos; bestehen.</translation>
+        <location filename="../desktop-widgets/preferences/preferences_reset.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/>
-        <source>Subsurface cloud storage (credentials verified)</source>
-        <translation>Subsurface-Cloud-Speicher (Anmeldedaten bestätigt)</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>Hier können alle Voreinstellungen auf die Standardeinstellungen zurückgesetzt werden.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/>
-        <source>Subsurface cloud storage (incorrect password)</source>
-        <translation>Subsurface Cloud-Speicher (Passwort falsch)</translation>
+        <location filename="../desktop-widgets/preferences/preferences_reset.ui" line="50"/>
+        <source>Reset all preferences</source>
+        <translation>Alle Voreinstellungen zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/>
-        <source>Subsurface cloud storage (PIN required)</source>
-        <translation>Subsurface Cloud-Speicher (PIN erforderlich)</translation>
+        <location filename="../desktop-widgets/preferences/preferences_reset.cpp" line="6"/>
+        <source>Reset</source>
+        <translation>Zurücksetzen</translation>
     </message>
 </context>
 <context>
@@ -7706,20 +8677,35 @@ siehe 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>Drucken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="108"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="109"/>
         <source>&amp;Preview</source>
         <translation>Vorschau</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/printdialog.cpp" line="120"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="112"/>
+        <source>Export Html</source>
+        <translation>HTML exportieren</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="125"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="196"/>
+        <source>Filename to export html to</source>
+        <translation>Dateiname für HTML Export</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/printdialog.cpp" line="197"/>
+        <source>Html file</source>
+        <translation>HTML Datei</translation>
+    </message>
 </context>
 <context>
     <name>PrintOptions</name>
@@ -7845,138 +8831,138 @@ Bitte mit einem neuen Dateinamen exportieren.</translation>
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="814"/>
-        <source> (#%1 of %2)</source>
-        <translation> (#%1 von %2)</translation>
+        <location filename="../profile-widget/profilewidget2.cpp" line="811"/>
+        <source>Planned dive</source>
+        <translation>Geplanter Tauchgang</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>Manuell hinzugefügter Tauchgang</translation>
+    </message>
+    <message>
+        <location filename="../profile-widget/profilewidget2.cpp" line="815"/>
         <source>Unknown dive computer</source>
         <translation>Unbekannter Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="837"/>
-        <source>Show NDL / TTS was disabled because of excessive processing time</source>
-        <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation>
+        <location filename="../profile-widget/profilewidget2.cpp" line="819"/>
+        <source> (#%1 of %2)</source>
+        <translation> (#%1 von %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1451"/>
-        <source>Add gas change</source>
-        <translation>Gaswechsel setzen</translation>
+        <location filename="../profile-widget/profilewidget2.cpp" line="842"/>
+        <source>Show NDL / TTS was disabled because of excessive processing time</source>
+        <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</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>Als ersten Tauchcomputer setzen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="806"/>
-        <source>Planned dive</source>
-        <translation>Geplanter Tauchgang</translation>
-    </message>
-    <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="808"/>
-        <source>Manually added dive</source>
-        <translation>Manuell hinzugefügter Tauchgang</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>Diesen Tauchcomputer entfernen</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>Diesen Tauchcomputer in eigenen Tauchgang abspalten</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>Gaswechsel setzen</translation>
+    </message>
+    <message>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1453"/>
         <source> (cyl. %1)</source>
         <translation> (Fl. %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>CC Setpoint-Wechsel setzen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1462"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
         <source>Add bookmark</source>
         <translation>Markierung setzen</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>Tauchgang aufteilen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1469"/>
         <source>Change divemode</source>
         <translation>Tauchmodus wechseln</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>Profil bearbeiten</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1502"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1497"/>
         <source>Remove event</source>
         <translation>Entferne Ereignis</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>Ähnliche Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
         <source>Edit name</source>
         <translation>Name bearbeiten</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>Druck in Flasche %1 anpassen (momentan zu %2 interpoliert)</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>Alle Ereignisse einblenden</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1592"/>
         <source>Hide events</source>
         <translation>Ereignisse ausblenden</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 Ereignisse ausblenden?</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>Ausgewähltes Ereignis entfernen?</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>Name der Markierung bearbeiten</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1784"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1761"/>
         <source>Custom name:</source>
         <translation>Benutzerdefinierter Name:</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>Der Name ist zu lang!</translation>
     </message>
@@ -7984,161 +8970,194 @@ Bitte mit einem neuen Dateinamen exportieren.</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>Lokale Tauchdatendatei öffnen</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>Fehler bei Öffnen der lokalen Tauchdatendatei</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 Tauchgänge aus der lokalen Tauchdatendatei geladen</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>Falsche Cloud-Anmeldedaten</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/>
         <source>working in no-cloud mode</source>
         <translation>ohne Cloud-Anbindung</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>Fehler beim Lesen der lokalen Daten, ich gebe auf</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>keine Cloud-Anmeldedaten</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>Bitte geben Sie gültige Cloud-Anmeldedaten ein.</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>E-Mail-Adresse und Passwort für den Cloud-Speicher können nur aus Buchstaben, Zahlen und &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, sowie &apos;+&apos; bestehen.</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>Ungültiges Format für E-Mail-Adresse</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>Es wird versucht, den Cloud-Speicher mit neuen Anmeldeinformationen zu öffnen</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-Anmeldedaten werden getestet</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>Keine Antwort des Cloud-Servers zur Validierung der Anmeldeinformationen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="567"/>
-        <source>Incorrect cloud credentials</source>
-        <translation>Falsche Cloud-Anmeldedaten</translation>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="652"/>
+        <source>Incorrect email / password combination</source>
+        <translation>Falsche Email / Passwort-Kombination</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>Für Cloud-Anmeldeinformationen ist eine Bestätigungs-PIN erforderlich</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/>
+        <source>Incorrect PIN, please try again</source>
+        <translation>Falsche PIN, bitte versuchen Sie es erneut</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="665"/>
+        <source>PIN accepted, credentials verified</source>
+        <translation>PIN akzeptiert, Anmeldeinformationen überprüft</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="704"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation>Keine Verbindung zum Cloud-Server - Cloud-Account nicht bestätigt</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-Anmeldedaten sind ungültig</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>Kann den Cloud-Speicher nicht öffnen: Fehler beim Erstellen der https-Verbindung</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>Kann den Cloud-Speicher nicht öffnen: %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>Kann nicht zum Cloud-Speicher verbinden</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-Anmeldedaten gültig, Tauchgänge werden geladen...</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-Speicher-Fehler: %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>Tauchgänge werden aus dem lokalen Speicher geladen (Modus &apos;keine Cloud&apos;)</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>Verbindung zum Cloud-Server fehlgeschlagen, Fortsetzung ohne Cloud-Verbindung</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-Speicher erfolgreich geöffnet. Keine Tauchgänge in der Tauchgangsliste.</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>s</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1048"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1186"/>
         <source>weight</source>
         <translation>Blei</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>Fehler: Datei konnte nicht gesichert werden. Bitte Logdatei kopieren und an den Support melden.</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1660"/>
         <source>Unknown GPS location</source>
         <translation>Unbekannte GPS-Position</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1878"/>
+        <source>no default cylinder</source>
+        <translation>Keine Standardflasche</translation>
+    </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>Keine Tauchgänge in der Periode</translation>
     </message>
 </context>
 <context>
@@ -8158,6 +9177,19 @@ Bitte mit einem neuen Dateinamen exportieren.</translation>
     </message>
 </context>
 <context>
+    <name>RemoveWeight</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="1076"/>
+        <source>Remove weight</source>
+        <translation>Gewicht entfernen</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../commands/command_edit.cpp" line="1078"/>
+        <source>Remove weight (%n dive(s))</source>
+        <translation><numerusform>Gewicht entfernen (% n Tauchgang)</numerusform><numerusform>Gewicht entfernen (% n Tauchgänge)</numerusform></translation>
+    </message>
+</context>
+<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="17"/>
@@ -8195,6 +9227,19 @@ Bitte mit einem neuen Dateinamen exportieren.</translation>
     </message>
 </context>
 <context>
+    <name>ReplanDive</name>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="944"/>
+        <source>Replan dive</source>
+        <translation>Tauchgang neu planen</translation>
+    </message>
+    <message>
+        <location filename="../commands/command_edit.cpp" line="944"/>
+        <source>Edit profile</source>
+        <translation>Bearbeite Profil</translation>
+    </message>
+</context>
+<context>
     <name>ResetSettingsThread</name>
     <message>
         <location filename="../core/configuredivecomputerthreads.cpp" line="2250"/>
@@ -8235,203 +9280,326 @@ Bitte mit einem neuen Dateinamen exportieren.</translation>
 <context>
     <name>Settings</name>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="16"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="14"/>
         <source>Settings</source>
         <translation>Einstellungen</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>Undefiniert</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>Falsche Benutzername/Passwort-Kombination</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>Anmeldedaten müssen überprüft werden</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>Anmeldedaten überprüft</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>Kein Cloud-Modus</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>Allg. Einstellungen</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>Nicht zutreffend</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>Ändern</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>Motiv</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="81"/>
+        <source>Default Cylinder</source>
+        <translation>Standardflasche</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="93"/>
-        <source>Blue</source>
-        <translation>Blau</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="89"/>
+        <source>Cylinder:</source>
+        <translation>Flasche:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="112"/>
+        <source>Dive computers</source>
+        <translation>Tauchcomputer</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>regulärer Text</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="120"/>
+        <source>Forget remembered dive computers</source>
+        <translation>Tauchcomputer vergessen</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>Hervorheben</translation>
+        <source>Forget</source>
+        <translation>Vergessen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="140"/>
+        <source>Theme</source>
+        <translation>Motiv</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>Blau</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="153"/>
         <source>Pink</source>
         <translation>Pink</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>Dunkel</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="255"/>
-        <source>Scaling</source>
-        <translation>Skalierung</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="167"/>
+        <source>background</source>
+        <translation>Hintergrund</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="180"/>
+        <source>text</source>
+        <translation>Text</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="196"/>
+        <source>primary</source>
+        <translation>primär</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="211"/>
+        <source>primary text</source>
+        <translation>Haupttext</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="227"/>
+        <source>darker primary</source>
+        <translation>Dunkler Hauptbereich</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="242"/>
+        <source>darker primary text</source>
+        <translation>Dunklerer Haupttext</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="268"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="258"/>
+        <source>light primary</source>
+        <translation>Hellerer Hauptbereich</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="273"/>
+        <source>light primary text</source>
+        <translation>Heller Haupttext</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="293"/>
+        <source>secondary text</source>
+        <translation>Untertext</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="309"/>
+        <source>drawer</source>
+        <translation>Schublade</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="324"/>
         <source>smaller</source>
         <translation>klein</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>normal</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>groß</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="306"/>
-        <source>GPS location service</source>
-        <translation>GPS-Positionsdienst</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="351"/>
+        <source>Units</source>
+        <translation>Einheiten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="316"/>
-        <source>Distance threshold (meters)</source>
-        <translation>Entfernungsschwellwert</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>Zeitschwellwert</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="366"/>
+        <source>Imperial</source>
+        <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="361"/>
-        <source>Default Cylinder</source>
-        <translation>Standardflasche</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="375"/>
+        <source>Personalize</source>
+        <translation>Personalisieren</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="370"/>
-        <source>Cylinder:</source>
-        <translation>Flasche:</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="397"/>
+        <source>Depth</source>
+        <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="395"/>
-        <source>Dive computers</source>
-        <translation>Tauchcomputer</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="401"/>
+        <source>meters</source>
+        <translation>Meter</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="404"/>
-        <source>Forget remembered dive computers</source>
-        <translation>Tauchcomputer vergessen</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="409"/>
+        <source>feet</source>
+        <translation>Fuß</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="410"/>
-        <source>Forget</source>
-        <translation>Vergessen</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="417"/>
+        <source>Pressure</source>
+        <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="432"/>
-        <source>Units</source>
-        <translation>Einheiten</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="421"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="442"/>
-        <source>Use Imperial Units</source>
-        <translation>Zöllige Einheiten benutzen</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="429"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="458"/>
-        <source>Use Metric Units</source>
-        <translation>Metrische Einheiten benutzen</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="437"/>
+        <source>Volume</source>
+        <translation>Volumen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="486"/>
-        <source>Filter preferences</source>
-        <translation>Filtereinstellungen</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="495"/>
-        <source>Include notes in full text filtering</source>
-        <translation>Notizen in die Suche einbeziehen</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="449"/>
+        <source>cuft</source>
+        <translation>cft</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="510"/>
-        <source>Match filter case sensitive</source>
-        <translation>Groß-/Kleinschreibung beachten</translation>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="457"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
+        <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="481"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="489"/>
+        <source>lbs</source>
+        <translation>US-Pfund</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="501"/>
+        <source>Advanced</source>
+        <translation>fortgeschritten</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="509"/>
+        <source>GPS location service</source>
+        <translation>GPS-Positionsdienst</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="518"/>
+        <source>Distance threshold (meters)</source>
+        <translation>Entfernungsschwellwert</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="532"/>
+        <source>Time threshold (minutes)</source>
+        <translation>Zeitschwellwert</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>Zeige alle Bluetooth-Geräte,
-selbst wenn sie nicht als Tauchcomputer erkannt werden</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>Zeige vorübergehend alle Bluetooth-Geräte an
+auch wenn nicht als Tauchcomputer erkannt.
+Bitte melden Sie TC, die diese Einstellung benötigen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="582"/>
+        <source>Display</source>
+        <translation>Anzeige</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="590"/>
+        <source>Show only one column in Portrait mode</source>
+        <translation>Zeige im Porträtmodus nur eine Spalte </translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/Settings.qml" line="572"/>
+        <location filename="../mobile-widgets/qml/Settings.qml" line="611"/>
         <source>Developer</source>
         <translation>Entwickler</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>Entwicklermenü anzeigen</translation>
     </message>
@@ -8508,39 +9676,39 @@ Nicht alle Mediendateien haben Zeitstempel zwischen 30 Minuten vor und 30 Minute
         <translation>Welche/s Datum/Zeit werden im Bild angezeigt?</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>Öffne Bilddatei</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="287"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="277"/>
         <source>Image files</source>
         <translation>Bilddateien</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>Datum/Zeit des ausgewählten Tauchgangs</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>Datum/Zeit des ersten ausgewählten Tauchgangs</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>Datum/Zeit des letzten ausgewählten Tauchgangs</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>
 Dateien mit unpassendem Datum/Zeit</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>Kein Exif Datum/Zeit gefunden</translation>
     </message>
@@ -8658,25 +9826,25 @@ Dateien mit unpassendem Datum/Zeit</translation>
         <translation>Alle Dateien</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
-        <source>Subsurface files</source>
-        <translation>Subsurface Dateien</translation>
-    </message>
-    <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
         <source>Open Subsurface files</source>
         <translation>Subsurface Dateien öffnen</translation>
     </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
+        <source>Subsurface files</source>
+        <translation>Subsurface Dateien</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>Um Subsurface-mobile mit der Subsurface-Cloud zu benutzen, bitte die Cloud-Daten eingeben.&lt;br/&gt;&lt;br/&gt; Sollte dies die erste Benutzung on Subsurface-Cloud sein, bitte eine gültige E-Mail-Adresse (nur Kleinbuchstaben verwenden) und ein Passwort nach Wahl (Buchstaben und Ziffern) eingeben.&lt;br/&gt;&lt;br/&gt;Um Subsurface-mobile ohne Cloud, nur mit lokalen Daten zu verwenden, den Keine-Cloud-Schalter oben aktivieren.</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>Vielen Dank für die Registrierung bei Subsurface. Wir haben einen PIN-Code an &lt;b&gt;%1&lt;/b&gt; geschickt, um die Registrierung abzuschließen. Sollte innerhalb von 15 Minuten keine E-Mail eingehen, bitte die E-Mail-Adresse auf Tippfehler überprüfen und in den Spam-Order sehen.&lt;br/&gt;&lt;br/&gt;Bei Problemen beim Erstellen des Clould-Kontos bitte eine Nachricht im Benutzerforum (https://subsurface-divelog.org/user-forum/) hinterlassen.&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
@@ -8732,37 +9900,37 @@ Dateien mit unpassendem Datum/Zeit</translation>
         <translation>Anzug</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>Flaschen</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>Flasche hinzufügen</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>Blei</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>Gewicht hinzufügen</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>Rückgängig</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>Achtung: %1 Tauchgänge editiert</translation>
     </message>
@@ -8785,120 +9953,259 @@ Dateien mit unpassendem Datum/Zeit</translation>
         <translation>Information</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>TAUCHGANG</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="78"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="71"/>
+        <source>Dive mode</source>
+        <translation>Tauchmodus</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="95"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="300"/>
         <source>Interval</source>
         <translation>Oberflächenpause</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>Verw. Gase</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="123"/>
+        <source>Duration</source>
+        <translation>Dauer</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. Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="180"/>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="314"/>
+        <source>Avg. depth</source>
+        <translation>Ø Tiefe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="209"/>
+        <source>GAS</source>
+        <translation>GAS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="116"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="217"/>
+        <source>Gas name</source>
+        <translation>Gasname</translation>
+    </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>Gasverbrauch</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>AMV</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. Tiefe</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="364"/>
+        <source>ENVIRONMENT</source>
+        <translation>UMWELT</translation>
     </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>Ø Tiefe</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="231"/>
-        <source>Atm. pressure</source>
-        <translation>Oberflächendruck</translation>
-    </message>
-    <message>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="316"/>
-        <source>Air pressure</source>
-        <translation>Luftdruck</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>Lufttemp.</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>Wassertemp.</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>Dauer</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="436"/>
+        <source>Water type/Density</source>
+        <translation>Gewässerart/Dichte</translation>
     </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>Wassertyp</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="473"/>
+        <source>Atm. pressure/Altitude</source>
+        <translation>Atmosphärendruck/Höhe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="506"/>
+        <source>Surface waves</source>
+        <translation>Wellen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="537"/>
+        <source>Large</source>
+        <translation>Groß</translation>
+    </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>Sicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="76"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="586"/>
+        <source>Bad</source>
+        <translation>Schlecht</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="593"/>
+        <source>Good</source>
+        <translation>Gut</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="604"/>
+        <source>Current</source>
+        <translation>Strömung</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>Stark</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>Schwach</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="653"/>
+        <source>Surge</source>
+        <translation>Schwall</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="702"/>
+        <source>Chill</source>
+        <translation>Kälte</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="733"/>
+        <source>Freezing</source>
+        <translation>Eiskalt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="740"/>
+        <source>Comfy</source>
+        <translation>Angenehm</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>vom Tauchcomputer</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="30"/>
+        <source>Fresh</source>
+        <translation>Süßwasser</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="30"/>
+        <source>Salty</source>
+        <translation>Salzig</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="30"/>
+        <source>Salt</source>
+        <translation>Salz</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>Rückgängig</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <source>Warning: edited %1 dives</source>
+        <translation>Achtung: %1 Tauchgänge editiert</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>s</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>unbekannt</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>Verw. Gase</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="316"/>
+        <source>Air pressure</source>
+        <translation>Luftdruck</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="322"/>
+        <source>Dive time</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="324"/>
+        <source>Water type</source>
+        <translation>Wassertyp</translation>
+    </message>
 </context>
 <context>
     <name>TabDivePhotos</name>
@@ -8964,7 +10271,7 @@ Dateien mit unpassendem Datum/Zeit</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>Tauchplätze</translation>
     </message>
@@ -8974,7 +10281,18 @@ Dateien mit unpassendem Datum/Zeit</translation>
         <translation>Unbenutzte Tauchplätze löschen</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>Tauchplatz löschen?</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><numerusform>Dieser Tauchplatz ist mit %n Tauchgang verknüpft. Soll er wirklich gelöscht werden?</numerusform><numerusform>Dieser Tauchplatz ist mit %n Tauchgängen verknüpft. Soll er wirklich gelöscht werden?</numerusform></translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveSite.cpp" line="74"/>
         <source>New dive site</source>
         <translation>Neuer Tauchplatz</translation>
     </message>
@@ -8988,15 +10306,15 @@ Dateien mit unpassendem Datum/Zeit</translation>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="195"/>
-        <source>Depth</source>
-        <translation>Tiefe</translation>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/>
+        <source>Max. depth</source>
+        <translation>Max. Tiefe</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>Dauer</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>AMV</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="97"/>
@@ -9005,29 +10323,24 @@ Dateien mit unpassendem Datum/Zeit</translation>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/>
-        <source>Max. depth</source>
-        <translation>Max. Tiefe</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>Gesamtzeit</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>Dauer</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>Tauchgänge</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>AMV</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>
@@ -9089,38 +10402,38 @@ Dateien mit unpassendem Datum/Zeit</translation>
         <translation>Durchschnittsdauer aller ausgewählten Tauchgänge</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>s</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>
@@ -9129,20 +10442,25 @@ den folgenden Gasen gemischt werden:
 </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>und</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>Tiefe</translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
@@ -9386,33 +10704,50 @@ den folgenden Gasen gemischt werden:
 <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>%1klicken, um zu %2 gehen</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>Weitere Aktionen</translation>
+        <location filename="../profile-widget/divetooltipitem.cpp" line="137"/>
+        <source>Information</source>
+        <translation>Information</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>Weitere Aktionen</translation>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="15"/>
+        <source>Trip details</source>
+        <translation>Reisedetails</translation>
     </message>
-</context>
-<context>
-    <name>ToolTipItem</name>
     <message>
-        <location filename="../profile-widget/divetooltipitem.cpp" line="137"/>
-        <source>Information</source>
-        <translation>Information</translation>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="55"/>
+        <source>Save edits</source>
+        <translation>Änderungen speichern</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="62"/>
+        <source>Cancel edit</source>
+        <translation>Bearbeiten abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="82"/>
+        <source>Edit trip details</source>
+        <translation>Reise-Übersicht bearbeiten</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="95"/>
+        <source>Trip location:</source>
+        <translation>Reise-Ort</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/TripDetails.qml" line="109"/>
+        <source>Trip notes</source>
+        <translation>Reisenotizen</translation>
     </message>
 </context>
 <context>
@@ -9528,18 +10863,18 @@ Soll das nicht passieren, bitte &quot;Ablehnen&quot; klicken.</translation>
         <translation>Benutzerumfrage</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 Benutzerumfrage</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;Wir würden gerne mehr über unsere Benutzer, ihre Vorlieben und ihre Art, das Programm zu verwenden, lernen. Bitte gib uns eine Minute, füll das Formular aus und schick es ans Subsurface-Team.&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>Welche Art von Taucher sind Sie?</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>
@@ -9558,6 +10893,12 @@ Soll das nicht passieren, bitte &quot;Ablehnen&quot; klicken.</translation>
         <translation>Tauchgangsplaner</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>Von wo importieren Sie Daten?</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>
@@ -9594,16 +10935,10 @@ Soll das nicht passieren, bitte &quot;Ablehnen&quot; klicken.</translation>
         <translation>Die folgenden Systeminformationen werden ebenfalls übertragen.</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>Welche Art von Taucher sind Sie?</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>Von wo importieren Sie Daten?</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 Benutzerumfrage</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="19"/>
@@ -9694,12 +11029,12 @@ Sprache: %1</translation>
     <message>
         <location filename="../core/videoframeextractor.cpp" line="93"/>
         <source>ffmpeg failed to start - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
-        <translation type="unfinished"/>
+        <translation>ffmpeg konnte nicht gestartet werden - es werden keine Vorschaubilder erzeugt. Um Vorschaubilder zu erzeugen, den richtigen Pfad zum ffmpeg-Programm in den Voreinstellungen einstellen.</translation>
     </message>
     <message>
         <location filename="../core/videoframeextractor.cpp" line="97"/>
         <source>Failed waiting for ffmpeg - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
-        <translation type="unfinished"/>
+        <translation>Zu lange auf ffmpeg gewartet - es werden keine Vorschaubilder erzeugt. Um Vorschaubilder zu erzeugen, den richtigen Pfad zum ffmpeg-Programm in den Voreinstellungen einstellen.</translation>
     </message>
 </context>
 <context>
@@ -9766,12 +11101,12 @@ Sprache: %1</translation>
         <translation>Hochladen</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>Die Aktion hat zu lange gedauert</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="352"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="101"/>
         <source>Transferring data...</source>
         <translation>Daten werden übertragen...</translation>
     </message>
@@ -9779,17 +11114,17 @@ Sprache: %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>Typ</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>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
@@ -9813,17 +11148,17 @@ Sprache: %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>s</translation>
     </message>
@@ -9831,94 +11166,94 @@ Sprache: %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>Jahr 
  &gt; Monat / Reise</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>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="140"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="141"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="143"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="144"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="146"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="147"/>
         <source>
 Longest</source>
         <translation>
 Längster</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>Tiefe (%1)
  Durchschnitt</translation>
     </message>
     <message>
-        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="152"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="153"/>
         <source>
 Average maximum</source>
         <translation>
 Mittel der Maxima</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>AMV (%1)
  Durchschnitt</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)
 Durchschnitt</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>
@@ -9926,7 +11261,7 @@ Durchschnitt</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>Fehler beim Lesen der Kopfdaten</translation>
     </message>
@@ -9934,6 +11269,15 @@ Durchschnitt</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>Kann Datei %s nicht öffnen</translation>
+    </message>
+    <message>
         <location filename="../core/cochran.c" line="306"/>
         <location filename="../core/cochran.c" line="312"/>
         <location filename="../core/cochran.c" line="382"/>
@@ -9944,14 +11288,14 @@ Durchschnitt</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>Aufstieg</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>Batterie</translation>
     </message>
@@ -9978,7 +11322,7 @@ Durchschnitt</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"/>
@@ -10066,347 +11410,268 @@ Durchschnitt</translation>
         <translation>Trockentauchanzug</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="365"/>
+        <location filename="../core/datatrak.c" line="367"/>
         <source>no stop</source>
         <translation>kein Stopp</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>Deko</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="369"/>
+        <location filename="../core/datatrak.c" line="371"/>
         <source>single ascent</source>
         <translation>einzelner Aufstieg</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="371"/>
+        <location filename="../core/datatrak.c" line="373"/>
         <source>multiple ascent</source>
         <translation>mehrere Aufstiege</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="18"/>
-        <source>fresh</source>
-        <translation>süss</translation>
-    </message>
-    <message>
-        <location filename="../core/datatrak.c" line="373"/>
+        <location filename="../core/datatrak.c" line="375"/>
         <source>fresh water</source>
         <translation>Süßwasser</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="375"/>
+        <location filename="../core/datatrak.c" line="377"/>
         <source>salt water</source>
         <translation>Salzwasser</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
+        <location filename="../core/datatrak.c" line="398"/>
         <source>sight seeing</source>
         <translation>Besichtigung</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/datatrak.c" line="400"/>
         <source>club dive</source>
         <translation>Vereinstauchgang</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>Tauchlehrer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
+        <location filename="../core/datatrak.c" line="404"/>
         <source>instruction</source>
         <translation>Anweisung</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>Höhle</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>Eis</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="410"/>
+        <location filename="../core/datatrak.c" line="412"/>
         <source>search</source>
         <translation>suchen</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>Wrack</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>Fluss</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>Strömung</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>sonstige</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/datatrak.c" line="437"/>
         <source>Other activities</source>
         <translation>Sonstige Aktivitäten</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-Hinweise</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="503"/>
+        <location filename="../core/datatrak.c" line="504"/>
         <source>[Warning] Manual dive # %d
 </source>
         <translation>[Warnung] Manuelle Tauchgangsnummer %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>[Fehler] Speicher voll bei Tauchgang %d. Einlesen beendet.</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>[Fehler] Datei ist keine DataTrak-Datei. Abgebrochen</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="590"/>
+        <location filename="../core/datatrak.c" line="591"/>
         <source>Error: no dive</source>
         <translation>Fehler: kein Tauchgang</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>Offenes System</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="14"/>
-        <source>shore</source>
-        <translation>Ufer</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>tief</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>Kaverne</translation>
+        <location filename="../core/dive.c" line="33"/>
+        <source>Freedive</source>
+        <translation>Freitauchgang</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="16"/>
-        <source>altitude</source>
-        <translation>Berg</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>Luft</translation>
     </message>
     <message>
-        <location filename="../core/tag.c" line="17"/>
-        <source>pool</source>
-        <translation>Pool</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>See</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>Schüler</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>s</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>Kann keinen Ordner names &apos;theme&apos; finden</translation>
+    </message>
+    <message>
+        <location filename="../core/divesite-helper.cpp" line="21"/>
+        <source>No dive site layout categories set in preferences!</source>
+        <translation>Keine Kategorien in den Einstellungen für die Tauchplatzangaben festgelegt!</translation>
+    </message>
+    <message>
+        <location filename="../core/divesite-helper.cpp" line="29"/>
+        <location filename="../core/save-html.c" line="530"/>
+        <source>Tags</source>
+        <translation>Stichwörter</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>Sauerstoff</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="45"/>
+        <location filename="../core/equipment.c" line="66"/>
         <source>not used</source>
         <translation>unbenutzt</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <source>Open circuit</source>
-        <translation>Offenes System</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>cft</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 Pfund</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>Luft</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>integriert</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="253"/>
+        <location filename="../core/equipment.c" line="277"/>
         <source>belt</source>
         <translation>Gürtel</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="254"/>
+        <location filename="../core/equipment.c" line="278"/>
         <source>ankle</source>
         <translation>Fussblei</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>
@@ -10416,73 +11681,27 @@ Durchschnitt</translation>
         <translation>Keine Tauchgänge in der Datei &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>Fehler beim Lesen von &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>Kann CSV-Datei %s nicht öffnen; bitte verwenden Sie den Dialog Logbuchdatei importieren</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>Fehler beim Lesen von &apos;%s&apos;</translation>
+    </message>
+    <message>
         <location filename="../core/file.c" line="337"/>
         <source>Empty file &apos;%s&apos;</source>
         <translation>Leere Datei &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 fehlgeschlagen: kann &apos;%s&apos; nicht lesen</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="633"/>
-        <source>Mouth piece position OC</source>
-        <translation>Mundstücksposition offenes System</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="637"/>
-        <source>Mouth piece position CC</source>
-        <translation>Mundstücksposition geschlossenes System</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="641"/>
-        <source>Mouth piece position unknown</source>
-        <translation>Mundstücksposition unbekannt</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="645"/>
-        <source>Mouth piece position not connected</source>
-        <translation>Mundstücksposition nicht angeschlossen</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="652"/>
-        <source>Power off</source>
-        <translation>Ausschalten</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="702"/>
-        <source>O₂ calibration failed</source>
-        <translation>O₂-Kalibrierung fehlgeschlagen</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₂-Kalibrierung</translation>
-    </message>
-    <message>
-        <location filename="../core/import-csv.c" line="229"/>
-        <source>No dive profile found from &apos;%s&apos;</source>
-        <translation>Kein Profil in &apos;%s&apos; gefunden.</translation>
-    </message>
-    <message>
         <location filename="../core/git-access.c" line="85"/>
         <source>Checkout from storage (%lu/%lu)</source>
         <translation>Laden aus dem Cloud-Speicher (%lu/%lu)</translation>
@@ -10604,9 +11823,60 @@ Durchschnitt</translation>
         <translation>Datendatei wird synchronisiert</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>Erwarte GPS-Position</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="229"/>
+        <source>No dive profile found from &apos;%s&apos;</source>
+        <translation>Kein Profil in &apos;%s&apos; gefunden.</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 fehlgeschlagen: kann &apos;%s&apos; nicht lesen</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="654"/>
+        <source>Mouth piece position OC</source>
+        <translation>Mundstücksposition offenes System</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="658"/>
+        <source>Mouth piece position CC</source>
+        <translation>Mundstücksposition geschlossenes System</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="662"/>
+        <source>Mouth piece position unknown</source>
+        <translation>Mundstücksposition unbekannt</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="666"/>
+        <source>Mouth piece position not connected</source>
+        <translation>Mundstücksposition nicht angeschlossen</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="673"/>
+        <source>Power off</source>
+        <translation>Ausschalten</translation>
+    </message>
+    <message>
+        <location filename="../core/import-csv.c" line="723"/>
+        <source>O₂ calibration failed</source>
+        <translation>O₂-Kalibrierung fehlgeschlagen</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₂-Kalibrierung</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>unbekannt</translation>
@@ -10698,119 +11968,119 @@ Durchschnitt</translation>
         <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="632"/>
+        <location filename="../core/libdivecomputer.c" line="644"/>
         <source>Dive %d: %s</source>
         <translation>Tauchgang %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>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="648"/>
+        <location filename="../core/libdivecomputer.c" line="660"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="662"/>
+        <location filename="../core/libdivecomputer.c" line="674"/>
         <source>Error parsing temperature</source>
         <translation>Fehler beim Lesen der Temperatur</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>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="692"/>
+        <location filename="../core/libdivecomputer.c" line="704"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="701"/>
+        <location filename="../core/libdivecomputer.c" line="713"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="724"/>
+        <location filename="../core/libdivecomputer.c" line="736"/>
         <source>Error obtaining dive mode</source>
         <translation>Fehler beim Auslesen des Modus des Tauchcomputers</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>Fehler beim Lesen des Gasgemischs</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>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="778"/>
+        <location filename="../core/libdivecomputer.c" line="792"/>
         <source>Error registering the data</source>
         <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="809"/>
+        <location filename="../core/libdivecomputer.c" line="822"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Segmente</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>Tauchgang bereits heruntergeladen am %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>Ereignis: warte auf Benutzeraktion</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 serial=%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>Fehler beim Registrieren der Ereignisbehandlung</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>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1171"/>
+        <location filename="../core/libdivecomputer.c" line="1185"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</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>Fehler beim Erzeugen des libdivecomputer Contexts</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>Fehler beim Öffnen von %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>Fehler beim Öffnen von Gerät %s %s (%s).
 In solchen Fällen helfen in der Regel die Logdateien den Entwicklern bei der Fehlersuche. Diese können auf der &apos;Über&apos; Seite kopiert werden.</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>
@@ -10819,133 +12089,92 @@ In solchen Fällen ist oft eine libdivecomputer Logdatei hilfreich.
 Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</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>Keine neuen Tauchgänge vom Tauchcomputer heruntergeladen</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>mehrere GPS-Positionen für diesen Tauchplatz; ebenso %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>zusätzlicher Name für Platz: %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>Lade Tauchgänge aus dem lokalen Zwischenspeicher</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>Tauchdaten erfolgreich geöffnet</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>Unbekannter TC in Tauchgang %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>Fehler - %s - Tauchgang %d wird gelesen</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>Unverständliche Prozentangabe %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>Fehler beim Lesen von &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>Kann Stylesheet %s nicht öffnen</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="113"/>
-        <source>Decompression calculation aborted due to excessive time</source>
-        <translation>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</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>Warnung:</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="416"/>
-        <source>, effective GF=%d/%d</source>
-        <translation>, effektive 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>Setpoint-Änderung</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>Kann Gas %s nicht finden</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="160"/>
-        <source>depth</source>
-        <translation>Tiefe</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>Dauer</translation>
+        <location filename="../core/plannernotes.c" line="52"/>
+        <source>Isobaric counterdiffusion information</source>
+        <translation>Informationen zur isobaren Gegendiffusion (ICD)</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>Informationen zur isobaren Gegendiffusion (ICD)</translation>
-    </message>
-    <message>
         <location filename="../core/plannernotes.c" line="55"/>
         <source>&amp;#916;He</source>
         <translation>&amp;#916;He</translation>
@@ -10961,223 +12190,275 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans
         <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>Wechsle Gas auf %s (SP = %.1fbar)</translation>
-    </message>
-    <message>
-        <location filename="../core/plannernotes.c" line="374"/>
-        <source>Switch gas to %s</source>
-        <translation>Gaswechsel zu %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>Dekomodell: VPM-B ohne Konservatismus</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>HINWEIS / WARNUNG: DIES IST EINE NEUIMPLEMENTATION DES %s-ALGORITHMUS UND EINE DARAUF BASIERENDE TAUCHGANGSPLANERIMPLEMENTATION, DIE NUR EINER GERINGEN ZAHL VON TESTS UNTERZOGEN WURDE. WIR RATEN DRINGEND, TAUCHGÄNGE NICHT AUSSSCHLIESSLICH AUFGRUND DIESER RESULTATE ZU PLANEN!</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>basierend auf</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>AMV</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>Warnung:</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 von &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>Dekompressionsrechnung wegen Zeitüberschreitung abgebrochen</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 von &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s im berechneten Aufstieg)</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 von &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>Plan&lt;/b&gt; (überlappende Tauchgänge erkannt)</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>Plan&lt;/b&gt; erstellt am</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>Plan&lt;/b&gt; (Oberflächenpause</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="147"/>
+        <location filename="../core/plannernotes.c" line="159"/>
         <source>created on</source>
         <translation>erstellt am</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="137"/>
-        <source>dive plan&lt;/b&gt; created on</source>
-        <translation>Plan&lt;/b&gt; erstellt am</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>HINWEIS / WARNUNG: DIES IST EINE NEUIMPLEMENTATION DES %s-ALGORITHMUS UND EINE DARAUF BASIERENDE TAUCHGANGSPLANERIMPLEMENTATION, DIE NUR EINER GERINGEN ZAHL VON TESTS UNTERZOGEN WURDE. WIR RATEN DRINGEND, TAUCHGÄNGE NICHT AUSSSCHLIESSLICH AUFGRUND DIESER RESULTATE ZU PLANEN!</translation>
+        <location filename="../core/plannernotes.c" line="174"/>
+        <source>depth</source>
+        <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="130"/>
-        <source>dive plan&lt;/b&gt; (overlapping dives detected)</source>
-        <translation>Plan&lt;/b&gt; (überlappende Tauchgänge erkannt)</translation>
+        <location filename="../core/plannernotes.c" line="176"/>
+        <source>duration</source>
+        <translation>Dauer</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 auf %.*f %s in %d:%02d min - Runtime %d:%02u mit %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>Aufstieg</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>Abstieg</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 auf %.*f %s in %d:%02d min - Runtime %d:%02u mit %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>Auf %.*f %s bleiben für %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.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>Verbleibe auf %.*f %s für %d:%02d min - Runtime %d:%02u mit %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>Wechsle Gas auf %s (SP = %.1fbar)</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="389"/>
+        <source>Switch gas to %s</source>
+        <translation>Gaswechsel zu %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>Dekomodell: Bühlmann ZHL-16C mit GF niedrig = %d%% und GF hoch = %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>Dekomodell: VPM-B ohne Konservatismus</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="429"/>
         <source>Deco model: VPM-B at +%d conservatism</source>
         <translation>Dekomodell: VPM-B mit Konservatismus +%d</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="418"/>
+        <location filename="../core/plannernotes.c" line="431"/>
+        <source>, effective GF=%d/%d</source>
+        <translation>, effektive 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>Dekomodell: Sporttauchmodus basierend auf Bühlmann ZHL-16B mit GF niedrig = %d%% und GF hoch = %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>Oberflächendruck: %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>Luftdruck: %dmbar (%d%s)&lt;br/&gt;
+&lt;/div&gt;
+</translation>
     </message>
     <message>
-        <location filename="../core/plannernotes.c" line="441"/>
+        <location filename="../core/plannernotes.c" line="456"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gasverbrauch (ohne CCR Segmente):</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>Gasverbrauch (basierend auf AMV</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>Dies ist mehr Gas, als in der Flasche verfügbar ist!</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>Keine ausreichende Reserve für Aufstieg unter Wechselatmung!</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>basierend auf</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="521"/>
+        <source>SAC</source>
+        <translation>AMV</translation>
+    </message>
+    <message>
+        <location filename="../core/plannernotes.c" line="532"/>
         <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source>
         <translation>Erforderliches Minimum Gas überschreitet bereits den Anfangsdruck der Flasche!</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 von &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s/%.0f%s im berechneten Aufstieg)</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 von &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 von &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s im berechneten Aufstieg)</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 von &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>Grenzen für isobare Gegendiffusion (ICD) überschritten</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>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*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>niedriger pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="900"/>
-        <source>Can&apos;t find gas %s</source>
-        <translation>Kann Gas %s nicht finden</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>
@@ -11186,91 +12467,77 @@ Tiefe: %.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>AMV: %.*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>Deko: %umin @ %.0f%s
+        <translation>pO₂: %.2fbar
 </translation>
     </message>
     <message>
         <location filename="../core/profile.c" line="1472"/>
-        <source>Safety stop: %umin @ %.0f%s
-</source>
-        <translation>Sicherheitsstopp: %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>
@@ -11279,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>
@@ -11288,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>Dichte: %.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>Sicherheitsstopp: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/profile.c" line="1515"/>
         <source>Safety stop: unknown time @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: unbek. Zeit @ %.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>Deko: %umin @ %.0f%s
+</translation>
+    </message>
+    <message>
+        <location filename="../core/profile.c" line="1523"/>
         <source>Deco: unknown time @ %.0f%s
 </source>
         <translation>Deko: unbek. Zeit @ %.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 Deko
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1489"/>
+        <location filename="../core/profile.c" line="1529"/>
         <source>NDL: %umin
 </source>
         <translation>Nullzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1492"/>
+        <location filename="../core/profile.c" line="1532"/>
         <source>TTS: %umin
 </source>
         <translation>Gesamtaufstiegszeit: %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>Deko: %umin @ %.0f%s (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1503"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>In deco (calc)
 </source>
         <translation>Deko (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1506"/>
+        <location filename="../core/profile.c" line="1546"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>Nullzeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1508"/>
+        <location filename="../core/profile.c" line="1548"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>Nullzeit: &gt; 2h (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1512"/>
+        <location filename="../core/profile.c" line="1552"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>Gesamtaufstiegszeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1514"/>
+        <location filename="../core/profile.c" line="1554"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>Gesamtaufstiegszeit: &gt; 2h (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1517"/>
+        <location filename="../core/profile.c" line="1557"/>
         <source>RBT: %umin
 </source>
         <translation>Restgrundzeit: %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>Oberflächen 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>Berechnete Auftauchgrenze %.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>Gewebe %.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 im Führungsgewebe
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1538"/>
+        <location filename="../core/profile.c" line="1580"/>
         <source>heart rate: %d
 </source>
         <translation>Puslrate: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1540"/>
+        <location filename="../core/profile.c" line="1582"/>
         <source>bearing: %d
 </source>
         <translation>Peilung: %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>Durchschnittstiefe bis hier %.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 AMV:%.*f%s/min</translation>
     </message>
@@ -11501,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>S</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 Pfund</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>Luft</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>mehr als %1 Tage</translation>
     </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="960"/>
+        <location filename="../core/qthelper.cpp" line="965"/>
+        <source>no dives</source>
+        <translation>Keine Tauchgänge</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 Tauchgang(e))</numerusform><numerusform>(%n Tauchgäng(e))</numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1181"/>
+        <location filename="../core/qthelper.cpp" line="1204"/>
         <source>OXYGEN</source>
         <translation>SAUERSTOFF</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>Kann Datei %s nicht öffnen</translation>
+        <location filename="../core/qthelper.cpp" line="1308"/>
+        <location filename="../core/units.c" line="65"/>
+        <source>cuft</source>
+        <translation>cft</translation>
+    </message>
+    <message>
+        <location filename="../core/save-git.c" line="922"/>
+        <source>Start saving data</source>
+        <translation>Beginne Datenspeicherung</translation>
+    </message>
+    <message>
+        <location filename="../core/save-git.c" line="931"/>
+        <source>Start saving dives</source>
+        <translation>Beginne Tauchgänge zu speichern</translation>
+    </message>
+    <message>
+        <location filename="../core/save-git.c" line="964"/>
+        <source>Done creating local cache</source>
+        <translation>Lokaler Zwischenspeicher erzeugt</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="501"/>
+        <location filename="../core/save-git.c" line="1221"/>
+        <source>Preparing to save data</source>
+        <translation>Bereite Datenspeicherung vor</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>Zeit</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="504"/>
+        <location filename="../core/save-html.c" line="508"/>
         <source>Location</source>
         <translation>Position</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="509"/>
         <source>Air temp.</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="506"/>
+        <location filename="../core/save-html.c" line="510"/>
         <source>Water temp.</source>
         <translation>Wassertemp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="507"/>
+        <location filename="../core/save-html.c" line="511"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="508"/>
+        <location filename="../core/save-html.c" line="512"/>
         <source>Expand all</source>
         <translation>Alle ausfalten</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../core/save-html.c" line="513"/>
         <source>Collapse all</source>
         <translation>Alle einfalten</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="510"/>
+        <location filename="../core/save-html.c" line="514"/>
         <source>Trips</source>
         <translation>Reisen</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="511"/>
+        <location filename="../core/save-html.c" line="515"/>
         <source>Statistics</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="512"/>
+        <location filename="../core/save-html.c" line="516"/>
         <source>Advanced search</source>
         <translation>Erweiterte Suche</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="515"/>
+        <location filename="../core/save-html.c" line="520"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="516"/>
+        <location filename="../core/save-html.c" line="521"/>
+        <source>WaveSize</source>
+        <translation>Wellengröße</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="522"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="517"/>
+        <location filename="../core/save-html.c" line="523"/>
+        <source>Current</source>
+        <translation>Strömung</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="524"/>
+        <source>Surge</source>
+        <translation>Schwall</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="525"/>
+        <source>Chill</source>
+        <translation>Kälte</translation>
+    </message>
+    <message>
+        <location filename="../core/save-html.c" line="526"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="518"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Divemaster</source>
         <translation>Tauchgruppenleiter</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="519"/>
+        <location filename="../core/save-html.c" line="528"/>
         <source>Buddy</source>
         <translation>Tauchpartner</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="520"/>
+        <location filename="../core/save-html.c" line="529"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../core/divesite-helper.cpp" line="21"/>
-        <source>No dive site layout categories set in preferences!</source>
-        <translation>Keine Kategorien in den Einstellungen für die Tauchplatzangaben festgelegt!</translation>
-    </message>
-    <message>
-        <location filename="../core/divesite-helper.cpp" line="29"/>
-        <location filename="../core/save-html.c" line="521"/>
-        <source>Tags</source>
-        <translation>Stichwörter</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>Notizen</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>Mehr Details anzeigen</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="526"/>
+        <location filename="../core/save-html.c" line="535"/>
         <source>Yearly statistics</source>
         <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="527"/>
+        <location filename="../core/save-html.c" line="536"/>
         <source>Year</source>
         <translation>Jahr</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="528"/>
+        <location filename="../core/save-html.c" line="537"/>
         <source>Total time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="529"/>
+        <location filename="../core/save-html.c" line="538"/>
         <source>Average time</source>
         <translation>Durchschnittszeit</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="530"/>
+        <location filename="../core/save-html.c" line="539"/>
         <source>Shortest time</source>
         <translation>Kürzeste Zeit</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="531"/>
+        <location filename="../core/save-html.c" line="540"/>
         <source>Longest time</source>
         <translation>Längste Zeit</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="532"/>
+        <location filename="../core/save-html.c" line="541"/>
         <source>Average depth</source>
         <translation>Durchschnittstiefe</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. Tiefe</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. Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="544"/>
         <source>Average SAC</source>
         <translation>Durchschnittliches AMV</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. AMV</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. AMV</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="538"/>
+        <location filename="../core/save-html.c" line="547"/>
         <source>Average temp.</source>
         <translation>Durchschnittstemp.</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>Zurück zur Liste</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="544"/>
+        <location filename="../core/save-html.c" line="553"/>
         <source>Dive #</source>
         <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="545"/>
+        <location filename="../core/save-html.c" line="554"/>
         <source>Dive profile</source>
         <translation>Tauchprofil</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="546"/>
+        <location filename="../core/save-html.c" line="555"/>
         <source>Dive information</source>
         <translation>Tauchinformation</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="547"/>
+        <location filename="../core/save-html.c" line="556"/>
         <source>Dive equipment</source>
         <translation>Tauchausrüstung</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>Typ</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="549"/>
+        <location filename="../core/save-html.c" line="558"/>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="550"/>
+        <location filename="../core/save-html.c" line="559"/>
         <source>Work pressure</source>
         <translation>Arbeitsdruck</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="551"/>
+        <location filename="../core/save-html.c" line="560"/>
         <source>Start pressure</source>
         <translation>Anfangsdruck</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="552"/>
+        <location filename="../core/save-html.c" line="561"/>
         <source>End pressure</source>
         <translation>Enddruck</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>Ereignisse</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="557"/>
+        <location filename="../core/save-html.c" line="566"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="558"/>
+        <location filename="../core/save-html.c" line="567"/>
         <source>Value</source>
         <translation>Wert</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="559"/>
+        <location filename="../core/save-html.c" line="568"/>
         <source>Coordinates</source>
         <translation>Koordinaten</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="560"/>
+        <location filename="../core/save-html.c" line="569"/>
         <source>Dive status</source>
         <translation>Tauchstatus</translation>
     </message>
     <message>
+        <location filename="../core/save-xml.c" line="758"/>
+        <source>Failed to save dives to %s (%s)</source>
+        <translation>Konnte Tauchgänge nicht nach %s speichern (%s)</translation>
+    </message>
+    <message>
+        <location filename="../core/save-xml.c" line="874"/>
+        <source>Failed to save divesites to %s (%s)</source>
+        <translation>Konnte Tauchplätze nicht nach %s speichern (%s)</translation>
+    </message>
+    <message>
         <location filename="../core/statistics.c" line="146"/>
         <source>All (by type stats)</source>
         <translation>Alle (nach Typen-Statistik)</translation>
@@ -11863,86 +13241,156 @@ EADD: %d%s / %.1fg/ℓ
         <translation>Alle (nach Temperatur)</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>Freitauchgang</translation>
-    </message>
-    <message>
         <location filename="../core/statistics.c" line="226"/>
         <source>All (by trip stats)</source>
         <translation>Alle (nach Reisen)</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>Mär</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>Mai</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>Sep</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>Dez</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>Ufer</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="15"/>
+        <source>deep</source>
+        <translation>tief</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="15"/>
+        <source>cavern</source>
+        <translation>Kaverne</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="16"/>
+        <source>altitude</source>
+        <translation>Berg</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="17"/>
+        <source>pool</source>
+        <translation>Pool</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="17"/>
+        <source>lake</source>
+        <translation>See</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="18"/>
+        <source>fresh</source>
+        <translation>süss</translation>
+    </message>
+    <message>
+        <location filename="../core/tag.c" line="18"/>
+        <source>student</source>
+        <translation>Schüler</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>Keine</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="10"/>
+        <source>Ocean</source>
+        <translation>Ozean</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>Bundesland</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="13"/>
+        <source>County</source>
+        <translation>Landkreis</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="14"/>
+        <source>Town</source>
+        <translation>Stadt</translation>
+    </message>
+    <message>
+        <location filename="../core/taxonomy.c" line="15"/>
+        <source>City</source>
+        <translation>Großstadt</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
@@ -11998,67 +13446,67 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Details für #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>wetsuit</source>
         <translation>Nass-Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>semidry</source>
         <translation>halbtrocken</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>drysuit</source>
         <translation>Trockentauchanzug</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>Weste</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="798"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>long john</source>
         <translation>Latzhose</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="798"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>jacket</source>
         <translation>Jacke</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="798"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>full suit</source>
         <translation>vollständiger Tauchanzug</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>Zweiteiler</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="799"/>
+        <location filename="../core/uemis-downloader.c" line="800"/>
         <source>membrane</source>
         <translation>Membran</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1338"/>
+        <location filename="../core/uemis-downloader.c" line="1339"/>
         <source>Initialise communication</source>
         <translation>Kommunikation einleiten</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-Initialisierung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1353"/>
+        <location filename="../core/uemis-downloader.c" line="1354"/>
         <source>Start download</source>
         <translation>Beginne mit dem Herunterladen</translation>
     </message>
@@ -12153,6 +13601,36 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Batteriealarm</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>
@@ -12168,40 +13646,6 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Dauer:</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>s</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>Kann keinen Ordner names &apos;theme&apos; finden</translation>
-    </message>
-    <message>
         <location filename="../core/worldmap-save.c" line="52"/>
         <source>Max. depth:</source>
         <translation>Max. Tiefe:</translation>
@@ -12227,6 +13671,66 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Notizen:</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="64"/>
+        <source>Remove this point</source>
+        <translation>Diesen Punkt entfernen</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="558"/>
+        <source>Don&apos;t save an empty log to the cloud</source>
+        <translation>Kein leeres Logbuch in der Cloud speichern</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/>
+        <source>Average</source>
+        <translation>Ø</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
+        <source>Minimum</source>
+        <translation>Min.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
+        <source>Maximum</source>
+        <translation>Max.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/>
+        <source>Invalid response from server</source>
+        <translation>Ungültige Serverantwort</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="163"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation>%1 anstelle des erwarteten XML Tags &apos;DiveDateReader&apos;.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="209"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation>XML Tag &apos;DiveDates&apos; nicht gefunden.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="216"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation>Ungültige XML Antwort. Zeile %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../profile-widget/diveprofileitem.cpp" line="191"/>
+        <source>planned waypoint above ceiling</source>
+        <translation>Wegpunkt verletzt Dekoschranke</translation>
+    </message>
+    <message>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1655"/>
+        <source>modechange</source>
+        <translation>Tauchmoduswechsel</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>Built</translation>
@@ -12301,250 +13805,172 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
+</context>
+<context>
+    <name>main</name>
     <message>
-        <location filename="../profile-widget/diveprofileitem.cpp" line="190"/>
-        <source>planned waypoint above ceiling</source>
-        <translation>Wegpunkt verletzt Dekoschranke</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="9"/>
-        <source>None</source>
-        <translation>Keine</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="10"/>
-        <source>Ocean</source>
-        <translation>Ozean</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>Bundesland</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="13"/>
-        <source>County</source>
-        <translation>Landkreis</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="14"/>
-        <source>Town</source>
-        <translation>Stadt</translation>
-    </message>
-    <message>
-        <location filename="../core/taxonomy.c" line="15"/>
-        <source>City</source>
-        <translation>Großstadt</translation>
-    </message>
-    <message>
-        <location filename="../core/save-git.c" line="916"/>
-        <source>Start saving data</source>
-        <translation>Beginne Datenspeicherung</translation>
-    </message>
-    <message>
-        <location filename="../core/save-git.c" line="925"/>
-        <source>Start saving dives</source>
-        <translation>Beginne Tauchgänge zu speichern</translation>
-    </message>
-    <message>
-        <location filename="../core/save-git.c" line="958"/>
-        <source>Done creating local cache</source>
-        <translation>Lokaler Zwischenspeicher erzeugt</translation>
-    </message>
-    <message>
-        <location filename="../core/save-git.c" line="1209"/>
-        <source>Preparing to save data</source>
-        <translation>Bereite Datenspeicherung vor</translation>
-    </message>
-    <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1658"/>
-        <source>modechange</source>
-        <translation>Tauchmoduswechsel</translation>
-    </message>
-    <message>
-        <location filename="../core/gpslocation.h" line="14"/>
-        <source>Waiting to aquire GPS location</source>
-        <translation>Erwarte GPS-Position</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/diveplanner.cpp" line="66"/>
-        <source>Remove this point</source>
-        <translation>Diesen Punkt entfernen</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="559"/>
-        <source>Don&apos;t save an empty log to the cloud</source>
-        <translation>Kein leeres Logbuch in der Cloud speichern</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>Ø</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <source>Dive list</source>
+        <translation>Tauchgangsliste</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
-        <source>Minimum</source>
-        <translation>Min.</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="243"/>
+        <source>Dive management</source>
+        <translation>Tauchgangsverwaltung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
-        <source>Maximum</source>
-        <translation>Max.</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>Zurück</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="406"/>
-        <source>Invalid response from server</source>
-        <translation>Ungültige Serverantwort</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="255"/>
+        <source>Add dive manually</source>
+        <translation>Tauchgang hinzufügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="414"/>
-        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
-        <translation>%1 anstelle des erwarteten XML Tags &apos;DiveDateReader&apos;.</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="267"/>
+        <source>Download from DC</source>
+        <translation>Von Tauchcomputer herunterladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="460"/>
-        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
-        <translation>XML Tag &apos;DiveDates&apos; nicht gefunden.</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="279"/>
+        <source>Apply GPS fixes</source>
+        <translation>GPS Positionen anwenden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="467"/>
-        <source>Malformed XML response. Line %1: %2</source>
-        <translation>Ungültige XML Antwort. Zeile %1: %2</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="299"/>
+        <source>Manual sync with cloud</source>
+        <translation>Manuelle Cloud-Synchronisation</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 Synchronisation deaktivieren</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="749"/>
-        <source>Failed to save dives to %s (%s)</source>
-        <translation>Konnte Tauchgänge nicht nach %s speichern (%s)</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="312"/>
+        <source>Enable auto cloud sync</source>
+        <translation>Automatische Synchronisation</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="871"/>
-        <source>Failed to save divesites to %s (%s)</source>
-        <translation>Konnte Tauchplätze nicht nach %s speichern (%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>Abschalten der Cloud-Synchronisierung führt dazu, dass sämtliche Daten nur lokal gespeichert werden. Dies ist sinnvoll bei beschränkter Internetverfügbarkeit. Durch Auswählen von &quot;Manuelle Cloud-Synchronisation&quot; kann eine Synchronisation explizit gestartet werden, wenn eine ausreichende Internetverbindung besteht.</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>Übersicht der Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
-        <source>Dive list</source>
-        <translation>Tauchgangsliste</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="339"/>
+        <source>Export</source>
+        <translation>Exportiere</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="233"/>
-        <source>Dive management</source>
-        <translation>Tauchgangsverwaltung</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="351"/>
+        <source>Location</source>
+        <translation>Position</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
-        <source>Disable auto cloud sync</source>
-        <translation>Automatische Synchronisation deaktivieren</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="373"/>
+        <source>Show GPS fixes</source>
+        <translation>GPS-Positionen anzeigen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
-        <source>Enable auto cloud sync</source>
-        <translation>Automatische Synchronisation</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="386"/>
+        <source>Clear GPS cache</source>
+        <translation>GPS-Speicher löschen</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>Ortungsdienst deaktivieren</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="365"/>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="238"/>
-        <source>Add dive manually</source>
-        <translation>Tauchgang hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
-        <source>Download from DC</source>
-        <translation>Von Tauchcomputer herunterladen</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="397"/>
+        <source>Run location service</source>
+        <translation>Ortungsdienst ausführen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="273"/>
-        <source>Manual sync with cloud</source>
-        <translation>Manuelle Cloud-Synchronisation</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="408"/>
+        <source>Settings</source>
+        <translation>Einstellungen</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>Abschalten der Cloud-Synchronisierung führt dazu, dass sämtliche Daten nur lokal gespeichert werden. Dies ist sinnvoll bei beschränkter Internetverfügbarkeit. Durch Auswählen von &quot;Manuelle Cloud-Synchronisation&quot; kann eine Synchronisation explizit gestartet werden, wenn eine ausreichende Internetverbindung besteht.</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="421"/>
+        <source>Help</source>
+        <translation>Hilfe</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="312"/>
-        <source>GPS</source>
-        <translation>GPS</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="433"/>
+        <source>About</source>
+        <translation>Über</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="400"/>
-        <source>Help</source>
-        <translation>Hilfe</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="444"/>
+        <source>Show user manual</source>
+        <translation>Benutzerhandbuch anzeigen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="264"/>
-        <source>Apply GPS fixes</source>
-        <translation>GPS Positionen anwenden</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="453"/>
+        <source>Ask for support</source>
+        <translation>Support fragen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="319"/>
-        <source>Show GPS fixes</source>
-        <translation>GPS-Positionen anzeigen</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>Fehler beim Öffnen des E-Mail-Clients. Bitte manuell eine Support-E-Mail an support@subsurface-divelog.org erstellen. Die Protokolle wurden in die Zwischenablage kopiert und können in diese E-Mail eingefügt werden.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="332"/>
-        <source>Clear GPS cache</source>
-        <translation>GPS-Speicher löschen</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="467"/>
+        <source>Reset forgotten Subsurface Cloud password</source>
+        <translation>Vergessenes Passwort für die Subsurface Cloud zurücksetzen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="378"/>
+        <location filename="../mobile-widgets/qml/main.qml" line="478"/>
         <source>Developer</source>
         <translation>Entwickler</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-Protokoll</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="389"/>
-        <source>Theme information</source>
-        <translation>Theme-Information</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="495"/>
+        <source>Test busy indicator (toggle)</source>
+        <translation>Verlaufsanzeige testen (umschalten)</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="354"/>
-        <source>About</source>
-        <translation>Über</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>Benachrichtigungstext testen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/main.qml" line="343"/>
-        <source>Run location service</source>
-        <translation>Ortungsdienst ausführen</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="511"/>
+        <source>Theme information</source>
+        <translation>Theme-Information</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/main.qml" line="28"/>
-        <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/main.qml" line="28"/>
-        <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/main.qml" line="28"/>
-        <source>Hello World</source>
-        <translation>Guten Tag, liebe Welt!</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="519"/>
+        <source>Enable verbose logging</source>
+        <translation>Ausführliche Protokollierung aktivieren</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="521"/>
+        <source>Not persistent</source>
+        <translation>Nicht persistent</translation>
     </message>
 </context>
 <context>
@@ -12659,33 +14085,9 @@ p, li { white-space: pre-wrap; }
         <translation>Planung</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. Schaltdauer O₂% unter 100%</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="439"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="595"/>
-        <source>VPM-B deco</source>
-        <translation>VPM-B Deko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="502"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="596"/>
-        <source>Bühlmann deco</source>
-        <translation>Bühlmann Deko</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="512"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="597"/>
-        <source>Reserve gas</source>
-        <translation>Reservegas</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"/>
@@ -12693,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>
@@ -12713,10 +14107,24 @@ p, li { white-space: pre-wrap; }
         <translation>Nur bei erforderlichen Stopps umschalten</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>Plane Rückengas Pausen</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>Letzter Stopp auf 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"/>
@@ -12728,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>Letzter Stopp auf 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>Plane Rückengas Pausen</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. Schaltdauer O₂% unter 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>Direkter Abstieg zur ersten Tiefe</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>GF niedrig</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>GF hoch</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="419"/>
@@ -12746,28 +14178,22 @@ p, li { white-space: pre-wrap; }
         <translation>Freizeitmodus</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>Direkter Abstieg zur ersten Tiefe</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>Sicherheitsstopp</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>Konservativismus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/plannerSettings.ui" line="310"/>
-        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="600"/>
-        <source>+</source>
-        <translation>+</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="439"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="595"/>
+        <source>VPM-B deco</source>
+        <translation>VPM-B Deko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="449"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="598"/>
+        <source>Safety stop</source>
+        <translation>Sicherheitsstopp</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
@@ -12776,6 +14202,18 @@ p, li { white-space: pre-wrap; }
         <translation>Tauchmodus</translation>
     </message>
     <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="502"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="596"/>
+        <source>Bühlmann deco</source>
+        <translation>Bühlmann Deko</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="512"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="597"/>
+        <source>Reserve gas</source>
+        <translation>Reservegas</translation>
+    </message>
+    <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="522"/>
         <source>Bailout: Deco on OC</source>
         <translation>Bailout: OC-Deko</translation>
@@ -12793,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>Notizen</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>Ausführlicher Tauchplan</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>Zeige Aufstiege im Tauchplan oder behandle sie als implizit</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>Aufstiege in der Deko anzeigen</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>Zeige Runtime (absolute Zeit) der Stopps im Tauchplan</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>Zeige Runtime</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>Zeige Dauer (relative Zeit) der Stopps im Tauchplan.</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>Zeige Segmentdauer</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>Berechne Variationen des Plans (erhöhte Rechenleistung)</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>Planvariationen anzeigen</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>Deko AMV</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>Wird zur Best-Mix-Berechnung verwendet. Best-Mix kann in der &quot;Verfügbare Gase&quot;-Tabelle ausgewählt werden, indem hinter der Tiefe &quot;B&quot; (für Trimix-Best-Mix) oder &quot;BN&quot; (für Nitro-Best-Mix) angegeben wird.</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>Berechne Variationen des Plans (erhöhte Rechenleistung)</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="754"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="613"/>
+        <source>Bottom SAC</source>
+        <translation>Grund AMV</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>Planvariationen anzeigen</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="761"/>
+        <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="614"/>
+        <source>Bottom pO₂</source>
+        <translation>Grund 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>Deko pO₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="782"/>
@@ -12842,100 +14364,106 @@ p, li { white-space: pre-wrap; }
         <translation>Wird für die Minimum Gas Berechnung verwendet. Maximale zusätzliche Zeit auf maximaler Tiefe nach Gasverlust bei einem Partner.</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>Wird zur Best-Mix-Berechnung verwendet. Best-Mix kann in der &quot;Verfügbare Gase&quot;-Tabelle ausgewählt werden, indem hinter der Tiefe &quot;B&quot; (für Trimix-Best-Mix) oder &quot;BN&quot; (für Nitro-Best-Mix) angegeben wird.</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="837"/>
+        <source>Treat oxygen as narcotic when computing best mix</source>
+        <translation>Behandle Sauerstoff als Betäubungsmittel, wenn die beste Mischung berechnet wird</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>GF niedrig</translation>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="840"/>
+        <source>O₂ narcotic</source>
+        <translation>O₂ narkotisch</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>GF hoch</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="54"/>
+        <source>Cannot prepare dives, none selected?</source>
+        <translation>Kann Tauchgänge nicht erstellen, keine ausgewählt?</translation>
     </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>Grund AMV</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="71"/>
+        <source>building zip file to upload</source>
+        <translation>Erstelle Zip-Datei zum Hochladen</translation>
     </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>Grund pO₂</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="76"/>
+        <source>Stylesheet to export to divelogs.de is not found</source>
+        <translation>Stylesheet für Export zu divelogs.de nicht gefunden</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>Zip_Datei für Upload konnte nicht erzeugt werden: %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>Notizen</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="148"/>
+        <source>internal error</source>
+        <translation>ein interner Fehler ist aufgetreten</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>Zeige Runtime (absolute Zeit) der Stopps im Tauchplan</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="159"/>
+        <source>Conversion of dive %1 to divelogs.de format failed</source>
+        <translation>Konvertierung von Tauchgang %1 in divelogs.de-Format ist fehlgeschlagen</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>Zeige Runtime</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="187"/>
+        <source>error writing zip file: %s zip error %d system error %d - %s</source>
+        <translation>Fehler beim Schreiben der ZIP-Datei: %s ZIP-Fehler %d Systemfehler %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>Zeige Dauer (relative Zeit) der Stopps im Tauchplan.</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="213"/>
+        <source>Uploading dives</source>
+        <translation>Hochladen der Tauchgänge</translation>
     </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>Zeige Segmentdauer</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="294"/>
+        <source>Upload failed</source>
+        <translation>Hochladen fehlgeschlagen</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>Zeige Aufstiege im Tauchplan oder behandle sie als implizit</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="298"/>
+        <source>Upload successful</source>
+        <translation>Hochladen erfolgreich</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>Aufstiege in der Deko anzeigen</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="303"/>
+        <source>Login failed</source>
+        <translation>Anmeldung fehlgeschlagen</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>Ausführlicher Tauchplan</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="309"/>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="310"/>
+        <source>Cannot parse response</source>
+        <translation>Verstehe die Antwort nicht</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>Deko pO₂</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="323"/>
+        <source>divelogs.de not responding</source>
+        <translation>divelogs.de antwortet nicht</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>Deko AMV</translation>
+        <location filename="../core/uploadDiveLogsDE.cpp" line="336"/>
+        <source>network error %1</source>
+        <translation>Netzwerkfehler %1</translation>
+    </message>
+</context>
+<context>
+    <name>uploadDiveShare</name>
+    <message>
+        <location filename="../core/uploadDiveShare.cpp" line="85"/>
+        <source>Upload successful</source>
+        <translation>Hochladen erfolgreich</translation>
+    </message>
+    <message>
+        <location filename="../core/uploadDiveShare.cpp" line="97"/>
+        <source>dive-share.com not responding</source>
+        <translation>dive-share.com antwortet nicht</translation>
+    </message>
+    <message>
+        <location filename="../core/uploadDiveShare.cpp" line="110"/>
+        <source>network error %1</source>
+        <translation>Netzwerkfehler %1</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file