8 files changed, 7882 insertions, 24058 deletions

diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index c3c7e9ac6..a9b8b18a0 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -404,7 +404,7 @@
 <context>
     <name>CloudStorageAuthenticate</name>
     <message>
-        <location filename="../core/cloudstorage.cpp" line="65"/>
+        <location filename="../core/cloudstorage.cpp" line="66"/>
         <source>Cloud account verification required, enter PIN in preferences</source>
         <translation>Bestätigung des Cloud-Kontos erforderlich, bitte PIN in Einstellungen eintragen</translation>
     </message>
@@ -610,7 +610,7 @@
         <translation>&amp;Wiederherstellen</translation>
     </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="78"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="92"/>
         <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>
@@ -683,7 +683,7 @@
 <context>
     <name>Command::EditAirTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="227"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="241"/>
         <source>air temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
@@ -691,7 +691,7 @@
 <context>
     <name>Command::EditAtmPress</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="272"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="286"/>
         <source>Atm. pressure</source>
         <translation>Oberflächendruck</translation>
     </message>
@@ -699,7 +699,7 @@
 <context>
     <name>Command::EditDepth</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="320"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="334"/>
         <source>depth</source>
         <translation>Tiefe</translation>
     </message>
@@ -707,7 +707,7 @@
 <context>
     <name>Command::EditDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="342"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="356"/>
         <source>dive site</source>
         <translation>Tauchplatz</translation>
     </message>
@@ -763,7 +763,7 @@
 <context>
     <name>Command::EditDuration</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="296"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="310"/>
         <source>duration</source>
         <translation>Dauer</translation>
     </message>
@@ -771,7 +771,7 @@
 <context>
     <name>Command::EditNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="142"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="156"/>
         <source>notes</source>
         <translation>Notizen</translation>
     </message>
@@ -779,7 +779,7 @@
 <context>
     <name>Command::EditRating</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="185"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="199"/>
         <source>rating</source>
         <translation>Bewertung</translation>
     </message>
@@ -787,7 +787,7 @@
 <context>
     <name>Command::EditSuit</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="164"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="178"/>
         <source>suit</source>
         <translation>Anzug</translation>
     </message>
@@ -819,7 +819,7 @@
 <context>
     <name>Command::EditVisibility</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="206"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="220"/>
         <source>visibility</source>
         <translation>Sicht</translation>
     </message>
@@ -827,7 +827,7 @@
 <context>
     <name>Command::EditWaterTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="251"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="265"/>
         <source>water temperature</source>
         <translation>Wassertemperatur</translation>
     </message>
@@ -931,42 +931,42 @@
 <context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="181"/>
+        <location filename="../core/configuredivecomputer.cpp" line="183"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Sicherungsdatei %1 konnte nicht gespeichert werden. Fehlermeldung: %2</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="197"/>
+        <location filename="../core/configuredivecomputer.cpp" line="199"/>
         <source>Could not open backup file: %1</source>
         <translation>Sicherungsdatei konnte nicht geöffnet werden: %1</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="545"/>
+        <location filename="../core/configuredivecomputer.cpp" line="547"/>
         <source>Dive computer details read successfully</source>
         <translation>Tauchcomputerdetails erfolgreich gelesen</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="554"/>
+        <location filename="../core/configuredivecomputer.cpp" line="556"/>
         <source>Setting successfully written to device</source>
         <translation>Einstellungen erfolgreich übertragen</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="563"/>
+        <location filename="../core/configuredivecomputer.cpp" line="565"/>
         <source>Device firmware successfully updated</source>
         <translation>Geräte-Firmware erfolgreich aktualisiert</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="572"/>
+        <location filename="../core/configuredivecomputer.cpp" line="574"/>
         <source>Device settings successfully reset</source>
         <translation>Geräte-Einstellungen erfolgreich zurückgesetzt</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="588"/>
+        <location filename="../core/configuredivecomputer.cpp" line="590"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="607"/>
+        <location filename="../core/configuredivecomputer.cpp" line="609"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Verbindung zum Tauchcomputer konnte nicht hergestellt werden.</translation>
     </message>
@@ -2535,93 +2535,93 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Work press.</source>
         <translation>Betriebsdruck</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../qt-models/cylindermodel.cpp" line="26"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="27"/>
         <source>Start press.</source>
         <translation>Anfangsdruck</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>End press.</source>
         <translation>Enddruck</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>O₂%</source>
         <translation>O₂%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Deco switch at</source>
         <translation>Gaswechsel bei</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Bot. MOD</source>
         <translation>Grund MOD</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>MND</source>
         <translation>MND</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Use</source>
         <translation>Verwenden</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="53"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="54"/>
         <source>cuft</source>
         <translation>cft</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="57"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="58"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="237"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="238"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Hier klicken entfernt diese Flasche.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="248"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="249"/>
         <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="250"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="251"/>
         <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="252"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max. depth.</source>
         <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="235"/>
+        <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>
@@ -2629,55 +2629,55 @@
 <context>
     <name>DiveComponentSelection</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="487"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
         <source>Dive site: </source>
         <translation>Tauchplatz:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="489"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
         <source>Dive master: </source>
         <translation>Tauchgruppenführer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="491"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
         <source>Buddy: </source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="493"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="494"/>
         <source>Rating: </source>
         <translation>Bewertung:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="495"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="496"/>
         <source>Visibility: </source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="497"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="498"/>
         <source>Notes:
 </source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="499"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="500"/>
         <source>Suit: </source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="501"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
         <source>Tags: </source>
         <translation>Stichwörter: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="511"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="512"/>
         <source>Cylinders:
 </source>
         <translation>Flaschen:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="519"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/>
         <source>Weights:
 </source>
         <translation>Blei:
@@ -3052,38 +3052,38 @@ Position verwenden</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="186"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="187"/>
         <source> (cyl. %1)</source>
         <translation> (Fl. %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="190"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
         <source>ICD</source>
         <translation>ICD</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
         <source>ΔHe</source>
         <translation>ΔHe</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="193"/>
         <source>ΔN₂</source>
         <translation>ΔN₂</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="213"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="214"/>
         <source>Manual switch to OC</source>
         <translation>Manueller Wechsel auf OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="215"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> Anfang</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="217"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> Ende</translation>
@@ -3092,27 +3092,27 @@ Position verwenden</translation>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="37"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="38"/>
         <source>Date/time</source>
         <translation>Datum und Zeit</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="39"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="40"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="41"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="42"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -3177,117 +3177,117 @@ Position verwenden</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="911"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="912"/>
         <source>Expand all</source>
         <translation>Alle ausfalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="913"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="914"/>
         <source>Collapse all</source>
         <translation>Alle einfalten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="918"/>
         <source>Collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="921"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
         <source>Remove dive(s) from trip</source>
         <translation>Tauchgäng(e) aus Reise entfernen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="923"/>
         <source>Create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="937"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="938"/>
         <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="939"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="940"/>
         <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="943"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
         <source>Merge trip with trip above</source>
         <translation>Reise mit der darüber verbinden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="945"/>
         <source>Merge trip with trip below</source>
         <translation>Reise mit der darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="948"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="949"/>
         <source>Delete dive(s)</source>
         <translation>Tauchgäng(e) löschen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="950"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="951"/>
         <source>Mark dive(s) invalid</source>
         <translation>Tauchgäng(e) als ungültig markieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="954"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="955"/>
         <source>Merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="956"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
         <source>Renumber dive(s)</source>
         <translation>Tauchgänge neu nummerieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
         <source>Shift dive times</source>
         <translation>Tauchzeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
         <source>Split selected dives</source>
         <translation>Ausgewählte Tauchgänge aufteilen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
         <source>Load media from file(s)</source>
         <translation>Medien aus Datei(en) laden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="961"/>
         <source>Load media from web</source>
         <translation>Medien aus dem Netz laden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="986"/>
+        <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="989"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
         <source>Media files</source>
         <translation>Mediendateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
         <source>Image files</source>
         <translation>Bilddateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
         <source>Video files</source>
         <translation>Videodateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
+        <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="1041"/>
+        <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>
@@ -3553,7 +3553,7 @@ Position verwenden</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="559"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="113"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="115"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="412"/>
         <source>Light</source>
         <translation>Licht</translation>
@@ -3565,157 +3565,157 @@ Position verwenden</translation>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <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="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <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="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <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="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <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="90"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
         <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="92"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
         <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="94"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
         <source>Subsurface native XML format.</source>
         <translation>Natives Subsurface-XML-Format</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
         <source>Subsurface dive sites native XML format.</source>
         <translation>Subsurface Tauchplätze XML-Format</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
         <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="100"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
         <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="102"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
         <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="104"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
         <source>Write the profile image as PNG file.</source>
         <translation>Speicher Profilbild als PNG.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="108"/>
         <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="144"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
         <source>Export UDDF file as</source>
         <translation>UDDF-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
         <source>UDDF files</source>
         <translation>UDDF Dateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/>
         <source>CSV files</source>
         <translation>CSV Dateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="201"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="203"/>
         <source>HTML files</source>
         <translation>HTML Dateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="165"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Subsurface files</source>
         <translation>Subsurface Dateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="175"/>
         <source>Export Subsurface dive sites XML</source>
         <translation>Exportiere Tauchplätze als Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <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="148"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
+        <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="159"/>
+        <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="164"/>
+        <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="182"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
         <source>Save image depths</source>
         <translation>Tiefe speichern, in der das Bild aufgenommen wurde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>Export to TeX file</source>
         <translation>Export in TeX-Datei</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Save profile image</source>
         <translation>Speicher Profilbild</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="196"/>
         <source>Save profile data</source>
         <translation>Speicher Profildaten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="200"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="202"/>
         <source>Export HTML files as</source>
         <translation>HTML-Datei exportieren als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="214"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="216"/>
         <source>Please wait, exporting...</source>
         <translation>Bitte warten, Exportiervorgang...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="249"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="482"/>
+        <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>
@@ -4098,62 +4098,62 @@ Position verwenden</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="171"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="173"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="272"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="274"/>
         <source>cyl.</source>
         <translation>Fl.</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="378"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
         <source>Final depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
         <source>Run time</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
         <source>Used gas</source>
         <translation>Verw. Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
         <source>CC setpoint</source>
         <translation>CC Setpoint</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="390"/>
         <source>Dive mode</source>
         <translation>Tauchmodus</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1026"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1028"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1032"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1034"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1035"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1037"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1082"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1084"/>
         <source>Stop times</source>
         <translation>Stopp Zeiten</translation>
     </message>
@@ -4367,12 +4367,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveSiteSortedModel</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="271"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="278"/>
         <source>Delete dive site?</source>
         <translation>Tauchplatz löschen?</translation>
     </message>
     <message numerus="yes">
-        <location filename="../qt-models/divelocationmodel.cpp" line="272"/>
+        <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>
@@ -4381,186 +4381,186 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModelBase</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="66"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation>(%1 angezeigt)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="274"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="314"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="208"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="275"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="315"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="276"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="316"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="277"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="317"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="211"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="278"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="318"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="279"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>Depth(%1)</source>
         <translation>Tiefe(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="282"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="322"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="283"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="323"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="217"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="324"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="325"/>
         <source>Temp.(°%1)</source>
         <translation>Temp.(°%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>Weight(%1)</source>
         <translation>Gewicht(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>lbs</source>
         <translation>US-Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="288"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="328"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="222"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="289"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="329"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="223"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="290"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="330"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="291"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="331"/>
         <source>Cylinder</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="225"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="292"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="332"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="293"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="333"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>SAC(%1)</source>
         <translation>AMV(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="231"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="296"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="338"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="297"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="234"/>
         <source>Max. CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="300"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="342"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="301"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="343"/>
         <source>Tags</source>
         <translation>Stichwörter</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="237"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="344"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="238"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="345"/>
         <source>Media before/during/after dive</source>
         <translation>Medien vor/während/nach Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="304"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="240"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="305"/>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="241"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="306"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="346"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="242"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="307"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="347"/>
         <source>Buddy</source>
         <translation>Tauchpartner</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="243"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="308"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="348"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="309"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="349"/>
         <source>Location</source>
         <translation>Position</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="280"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="281"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="284"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
         <source>Temp.</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="286"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="287"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="294"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="295"/>
         <source>SAC</source>
         <translation>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="298"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="340"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="299"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="341"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="302"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="303"/>
         <source>Media</source>
         <translation>Medien</translation>
     </message>
@@ -4568,107 +4568,107 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/>
+        <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="249"/>
+        <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="277"/>
+        <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="526"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="717"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="528"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="719"/>
         <source>Done</source>
         <translation>Fertig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="562"/>
         <source>Uploading dive list...</source>
         <translation>Liste der Tauchgänge wird hochgeladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="594"/>
         <source>Downloading dive list...</source>
         <translation>Liste der Tauchgänge herunterladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="635"/>
         <source>Downloading %1 dives...</source>
         <translation>Lade %1 Tauchgänge vom Server...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="667"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="669"/>
         <source>Download finished - %1</source>
         <translation>Herunterladen beendet - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="681"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="683"/>
         <source>Problem with download</source>
         <translation>Problem beim Herunterladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/>
+        <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="682"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="692"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="694"/>
         <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="160"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="491"/>
+        <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="170"/>
+        <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="180"/>
+        <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="718"/>
+        <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="731"/>
+        <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="734"/>
+        <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="737"/>
+        <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="740"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="742"/>
         <source>Cannot parse response</source>
         <translation>Verstehe die Antwort nicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="751"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="753"/>
         <source>Error: %1</source>
         <translation>Fehler: %1</translation>
     </message>
@@ -4733,73 +4733,73 @@ Existing Site</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="86"/>
         <source>Download</source>
         <translation>Herunterladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="90"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Bluetooth-Modus auswählen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="177"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="180"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="202"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="205"/>
         <source>Connecting to dive computer</source>
         <translation>Verbinde mit Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Uemis dive computer</source>
         <translation>Finde Uemis Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Garmin dive computer</source>
         <translation>Garmin-Tauchcomputer finden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/>
         <source>Cancel download</source>
         <translation>Herunterladen abbrechen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="430"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="455"/>
         <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="431"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
         <source>Log files</source>
         <translation>Log Dateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="481"/>
         <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="457"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="482"/>
         <source>Dump files</source>
         <translation>Dump Dateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="485"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="510"/>
         <source>Retry download</source>
         <translation>Herunterladen wiederholen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="444"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="469"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="445"/>
+        <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>
@@ -4886,10 +4886,10 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="303"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="392"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="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="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="334"/>
         <source>Download</source>
         <translation>Herunterladen</translation>
@@ -4920,7 +4920,7 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="340"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
@@ -4936,72 +4936,72 @@ Existing Site</source>
         <translation>Bluetooth ist nicht aktiviert</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/>
         <source> Vendor name: </source>
         <translation>Hersteller:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
+        <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="101"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="105"/>
         <source> Dive Computer:</source>
         <translation>Tauchcomputer:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="145"/>
         <source> Connection:</source>
         <translation> Verbindung:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/>
         <source> Previously used dive computers: </source>
         <translation>Zuletzt benutzte Tauchcomputer:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/>
         <source>Retry</source>
         <translation>Wiederholen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="312"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="316"/>
         <source>Rescan</source>
         <translation>Neu scannen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="321"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="325"/>
         <source> Downloaded dives</source>
         <translation>Ausgelesene Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="322"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="326"/>
         <source>Info:</source>
         <translation>Info:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="345"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="349"/>
         <source>force downloading all dives</source>
         <translation>erneutes Herunterladen aller Tauchgänge erzwingen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="383"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="387"/>
         <source>Accept</source>
         <translation>Annehmen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="403"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="407"/>
         <source>Select All</source>
         <translation>Alles auswählen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="412"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="416"/>
         <source>Unselect All</source>
         <translation>Alle abwählen</translation>
     </message>
@@ -5009,7 +5009,7 @@ Existing Site</source>
 <context>
     <name>DownloadThread</name>
     <message>
-        <location filename="../core/downloadfromdcthread.cpp" line="101"/>
+        <location filename="../core/downloadfromdcthread.cpp" line="102"/>
         <source>No new dives downloaded from dive computer</source>
         <translation>Keine neuen Tauchgänge vom Tauchcomputer heruntergeladen</translation>
     </message>
@@ -5017,7 +5017,7 @@ Existing Site</source>
 <context>
     <name>EditBuddies</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="602"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="638"/>
         <source>buddies</source>
         <translation>Buddies</translation>
     </message>
@@ -5025,7 +5025,7 @@ Existing Site</source>
 <context>
     <name>EditDiveMaster</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="625"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="661"/>
         <source>dive master</source>
         <translation>Tauchgruppenführer</translation>
     </message>
@@ -5033,15 +5033,23 @@ Existing Site</source>
 <context>
     <name>EditMode</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="440"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="454"/>
         <source>dive mode</source>
         <translation>Tauchmodus</translation>
     </message>
 </context>
 <context>
+    <name>EditNumber</name>
+    <message>
+        <location filename="../desktop-widgets/command_edit.cpp" line="475"/>
+        <source>number</source>
+        <translation>Nummer</translation>
+    </message>
+</context>
+<context>
     <name>EditTags</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="570"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="606"/>
         <source>tags</source>
         <translation>Tags</translation>
     </message>
@@ -5049,7 +5057,7 @@ Existing Site</source>
 <context>
     <name>EditTagsBase</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="511"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="547"/>
         <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>
@@ -5104,129 +5112,134 @@ Existing Site</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="47"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="41"/>
         <source>Reset / close</source>
         <translation>Zurücksetzen / schließen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="57"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="102"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="123"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="140"/>
+        <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>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="64"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="58"/>
         <source>People</source>
         <translation>Personen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="71"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="95"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="147"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="189"/>
+        <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"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="78"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="72"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="85"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="79"/>
         <source>Tags</source>
         <translation>Stichwörter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="109"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="103"/>
         <source>From</source>
         <translation>Von</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="116"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="110"/>
         <source>To</source>
         <translation>Bis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="133"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="127"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="163"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="157"/>
         <source>Equipment</source>
         <translation>Ausrüstung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="179"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="173"/>
         <source>Water Temp</source>
         <translation>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="196"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="190"/>
         <source>Location</source>
         <translation>Position</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="203"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="197"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="210"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="204"/>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="217"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="211"/>
         <source>Air Temp</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="276"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="270"/>
         <source>Logged</source>
         <translation>Gelogged</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="286"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="280"/>
         <source>Planned</source>
         <translation>Geplant</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="330"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="310"/>
+        <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>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="345"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="364"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="383"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="402"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="421"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="440"/>
+        <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>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="350"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="369"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="388"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="407"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="426"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="445"/>
+        <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>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="355"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="374"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="393"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="412"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="431"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="450"/>
+        <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>
     </message>
@@ -5236,7 +5249,6 @@ Existing Site</source>
         <translation>Filter anzeigen/ausblenden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="316"/>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="124"/>
         <source>Close and reset filters</source>
         <translation>Filter schließen und zurücksetzen</translation>
@@ -5319,12 +5331,12 @@ Existing Site</source>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2225"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2227"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2230"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2232"/>
         <source>Firmware update failed!</source>
         <translation>Firmware-Aktualisierung fehlgeschlagen!</translation>
     </message>
@@ -5340,7 +5352,7 @@ Existing Site</source>
 <context>
     <name>GasSelectionModel</name>
     <message>
-        <location filename="../qt-models/models.cpp" line="38"/>
+        <location filename="../qt-models/models.cpp" line="39"/>
         <source>cyl.</source>
         <translation>Fl.</translation>
     </message>
@@ -5384,7 +5396,7 @@ Existing Site</source>
 <context>
     <name>GpsLocation</name>
     <message>
-        <location filename="../core/gpslocation.cpp" line="132"/>
+        <location filename="../core/gpslocation.cpp" line="134"/>
         <source>Unknown GPS location (no GPS source)</source>
         <translation>Unbekannte GPS-Position (kein GPS)</translation>
     </message>
@@ -5598,9 +5610,9 @@ Existing Site</source>
     <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="30"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="504"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="450"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="511"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="512"/>
         <source>Notes</source>
@@ -5626,21 +5638,21 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="110"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="228"/>
+        <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>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="120"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="229"/>
+        <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>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="195"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="545"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="498"/>
         <source>Location</source>
         <translation>Position</translation>
@@ -5683,25 +5695,24 @@ Existing Site</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="343"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="402"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="398"/>
         <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="412"/>
+        <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>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="62"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="513"/>
         <source>Equipment</source>
         <translation>Ausrüstung</translation>
@@ -5719,93 +5730,93 @@ Existing Site</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="70"/>
+        <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="64"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="66"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="65"/>
         <source>Statistics</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="68"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="67"/>
         <source>Media</source>
         <translation>Medien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="71"/>
         <source>Dive sites</source>
         <translation>Tauchplätze</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="91"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="90"/>
         <source>Apply changes</source>
         <translation>Änderungen anwenden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="95"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="94"/>
         <source>Discard changes</source>
         <translation>Änderungen Verwerfen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="99"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/>
         <source>Undo</source>
         <translation>Rückgängig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="731"/>
+        <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="225"/>
+        <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="226"/>
+        <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="264"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="260"/>
         <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="266"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="262"/>
         <source>This dive is being edited.</source>
         <translation>Dieser Tauchgang wird bearbeitet.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="494"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="458"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/>
         <source>Trip notes</source>
         <translation>Reisenotizen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="489"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="491"/>
         <source>Trip location</source>
         <translation>Reiseort</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="686"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="690"/>
         <source>Discard the changes?</source>
         <translation>Änderungen verwerfen?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="687"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="691"/>
         <source>You are about to discard your changes.</source>
         <translation>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation>
     </message>
@@ -5873,7 +5884,7 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="494"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="535"/>
         <source>Open</source>
         <translation>Öffnen</translation>
@@ -6292,45 +6303,45 @@ Existing Site</source>
         <translation>Cloud-Speicher ist online</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="485"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="532"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1514"/>
+        <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="491"/>
+        <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="495"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="691"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="655"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
+        <location filename="../desktop-widgets/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"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="692"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="693"/>
         <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="256"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
         <source>Template backup created</source>
         <translation>Sicherungskopie der Druckvorlage erstellt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="258"/>
         <source>The following backup printing templates were created:
 
 %1
@@ -6351,231 +6362,231 @@ 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="606"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="607"/>
         <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="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="620"/>
         <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="629"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="630"/>
         <source>Failure taking cloud storage online</source>
         <translation>Fehler beim Verbinden des Cloud-Speichers</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="703"/>
         <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="805"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="806"/>
         <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="857"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="858"/>
         <source>Print runtime table</source>
         <translation>Runtimetabelle anzeigen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="914"/>
         <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="1669"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1772"/>
+        <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="1750"/>
+        <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="1785"/>
+        <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="1016"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1017"/>
         <source>Yearly statistics</source>
         <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1284"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/>
         <source>Dive log files</source>
         <translation>Logbuch Dateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1263"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1543"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1559"/>
         <source>Subsurface files</source>
         <translation>Subsurface 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="1265"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
         <source>Cochran</source>
         <translation>Cochran</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
         <source>DiveLogs.de</source>
         <translation>DiveLogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
         <source>JDiveLog</source>
         <translation>JDiveLog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
         <source>Liquivision</source>
         <translation>Liquivision</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
         <source>Suunto</source>
         <translation>Suunto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
         <source>UDCF</source>
         <translation>UDCF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
         <source>UDDF</source>
         <translation>UDDF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
         <source>XML</source>
         <translation>XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
         <source>Divesoft</source>
         <translation>Divesoft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
         <source>Datatrak/WLog</source>
         <translation>Datatrak/WLog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
         <source>MkVI files</source>
         <translation>MkVI Dateien</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="1276"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
         <source>APD log viewer</source>
         <translation>APD Log Viewer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1276"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
         <source>OSTCtools</source>
         <translation>OSTCtools</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
         <source>DAN DL7</source>
         <translation>DAN DL7</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
         <source>CSV</source>
         <translation>CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/>
         <source>Dive site files</source>
         <translation>Tauchplatz Dateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
         <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="1344"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/>
         <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="618"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1349"/>
+        <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="1350"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/>
         <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="1542"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1558"/>
         <source>Save file as</source>
         <translation>Datei speichern unter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1630"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1646"/>
         <source>[local cache for] %1</source>
         <translation>[Lokaler Zwischenspeicher für] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1631"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1647"/>
         <source>[cloud storage for] %1</source>
         <translation>[Cloud-Speicher für] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1698"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/>
         <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="1699"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/>
         <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="1723"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1739"/>
         <source>Open dive log file</source>
         <translation>Logbuchdatei öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Contacting cloud service...</source>
         <translation>Kontaktaufnahme mit dem Cloud-Dienst...</translation>
     </message>
@@ -6698,7 +6709,7 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
 <context>
     <name>PasteDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="728"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="760"/>
         <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>
@@ -6931,22 +6942,32 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <translation>Alle Einstellungen auf Standardwert setzen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="14"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Open default log file</source>
         <translation>Standard-Logbuchdatei öffnen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Subsurface files</source>
         <translation>Subsurface Dateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
+        <source>Warning</source>
+        <translation>Warnung</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"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="70"/>
         <source>Select ffmpeg executable</source>
         <translation>ffmpeg-Programm auswählen</translation>
     </message>
@@ -7194,7 +7215,7 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen
         <translation>Mittlere Tiefe im Profil anzeigen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="12"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
@@ -7834,17 +7855,17 @@ Bitte mit einem neuen Dateinamen exportieren.</translation>
         <translation>Unbekannter Tauchcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="840"/>
+        <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>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1451"/>
         <source>Add gas change</source>
         <translation>Gaswechsel setzen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1435"/>
         <source>Make first dive computer</source>
         <translation>Als ersten Tauchcomputer setzen</translation>
     </message>
@@ -7859,103 +7880,103 @@ Bitte mit einem neuen Dateinamen exportieren.</translation>
         <translation>Manuell hinzugefügter Tauchgang</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1440"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
         <source>Delete this dive computer</source>
         <translation>Diesen Tauchcomputer entfernen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1441"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <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="1457"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
         <source> (cyl. %1)</source>
         <translation> (Fl. %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1463"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
         <source>Add setpoint change</source>
         <translation>CC Setpoint-Wechsel setzen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1465"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1462"/>
         <source>Add bookmark</source>
         <translation>Markierung setzen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1467"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1464"/>
         <source>Split dive into two</source>
         <translation>Tauchgang aufteilen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1477"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
         <source>Change divemode</source>
         <translation>Tauchmodus wechseln</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1501"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1498"/>
         <source>Edit the profile</source>
         <translation>Profil bearbeiten</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1505"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1502"/>
         <source>Remove event</source>
         <translation>Entferne Ereignis</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1507"/>
         <source>Hide similar events</source>
         <translation>Ähnliche Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1517"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
         <source>Edit name</source>
         <translation>Name bearbeiten</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1548"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1555"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1545"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1552"/>
         <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="1570"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1567"/>
         <source>Unhide all events</source>
         <translation>Alle Ereignisse einblenden</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide events</source>
         <translation>Ereignisse ausblenden</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 Ereignisse ausblenden?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1630"/>
         <source>Remove the selected event?</source>
         <translation>Ausgewähltes Ereignis entfernen?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1631"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1786"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1783"/>
         <source>Edit name of bookmark</source>
         <translation>Name der Markierung bearbeiten</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1787"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1784"/>
         <source>Custom name:</source>
         <translation>Benutzerdefinierter Name:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1792"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1789"/>
         <source>Name is too long!</source>
         <translation>Der Name ist zu lang!</translation>
     </message>
@@ -7963,146 +7984,151 @@ Bitte mit einem neuen Dateinamen exportieren.</translation>
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="206"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="207"/>
         <source>Starting...</source>
         <translation>Starten...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="275"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/>
         <source>Open local dive data file</source>
         <translation>Lokale Tauchdatendatei öffnen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="283"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Opening local data file failed</source>
         <translation>Fehler bei Öffnen der lokalen Tauchdatendatei</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/>
         <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="414"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/>
         <source>working in no-cloud mode</source>
         <translation>ohne Cloud-Anbindung</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="425"/>
         <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="427"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="434"/>
         <source>no cloud credentials</source>
         <translation>keine Cloud-Anmeldedaten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="428"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="504"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/>
         <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="460"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/>
         <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="466"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="473"/>
         <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="515"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/>
         <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="537"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="544"/>
         <source>Testing cloud credentials</source>
         <translation>Cloud-Anmeldedaten werden getestet</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="552"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="559"/>
         <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="560"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="567"/>
         <source>Incorrect cloud credentials</source>
         <translation>Falsche Cloud-Anmeldedaten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="566"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/>
         <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="593"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="600"/>
         <source>Cloud credentials are invalid</source>
         <translation>Cloud-Anmeldedaten sind ungültig</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="607"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/>
         <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="621"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="628"/>
         <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="634"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="641"/>
         <source>Cannot connect to cloud storage</source>
         <translation>Kann nicht zum Cloud-Speicher verbinden</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="646"/>
         <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="649"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="656"/>
         <source>Cloud storage error: %1</source>
         <translation>Cloud-Speicher-Fehler: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="695"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="702"/>
         <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="741"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="748"/>
         <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="766"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/>
         <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="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="942"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="953"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
         <source>sec</source>
         <translation>s</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1479"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1048"/>
+        <source>weight</source>
+        <translation>Blei</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1493"/>
         <source>Unknown GPS location</source>
         <translation>Unbekannte GPS-Position</translation>
     </message>
@@ -8118,15 +8144,15 @@ Bitte mit einem neuen Dateinamen exportieren.</translation>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2151"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2153"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2148"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2131"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2139"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2150"/>
         <source>Failed!</source>
         <translation>Fehlgeschlagen!</translation>
     </message>
@@ -8147,23 +8173,23 @@ Bitte mit einem neuen Dateinamen exportieren.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="138"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="139"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="90"/>
         <source>New starting number</source>
         <translation>Neue erste Nummer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="136"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="137"/>
         <source>New number</source>
         <translation>Neue Nummer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="141"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
         <source>Renumber selected dives</source>
         <translation>Angewählte Tauchgänge umnummerieren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="143"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="144"/>
         <source>Renumber all dives</source>
         <translation>Alle Tauchgänge umnummerieren</translation>
     </message>
@@ -8171,7 +8197,7 @@ Bitte mit einem neuen Dateinamen exportieren.</translation>
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2248"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2250"/>
         <source>Reset settings failed!</source>
         <translation>Zurücksetzen der Einstellungen ist fehlgeschlagen!</translation>
     </message>
@@ -8482,39 +8508,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="284"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="285"/>
         <source>Open image file</source>
         <translation>Öffne Bilddatei</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="286"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="287"/>
         <source>Image files</source>
         <translation>Bilddateien</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="367"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="368"/>
         <source>Selected dive date/time</source>
         <translation>Datum/Zeit des ausgewählten Tauchgangs</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="369"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
         <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="370"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="371"/>
         <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="372"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/>
         <source>
 Files with inappropriate date/time</source>
         <translation>
 Dateien mit unpassendem Datum/Zeit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="382"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="383"/>
         <source>No Exif date/time found</source>
         <translation>Kein Exif Datum/Zeit gefunden</translation>
     </message>
@@ -8616,28 +8642,28 @@ Dateien mit unpassendem Datum/Zeit</translation>
         <translation>Nachrichten (Fehlermeldungen, Warnungen usw.) importieren</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
         <source>Open SmartTrak files</source>
         <translation>SmartTrak Dateien öffnen</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
         <source>SmartTrak files</source>
         <translation>SmartTrak Dateien</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <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="65"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
         <source>Open Subsurface files</source>
         <translation>Subsurface Dateien öffnen</translation>
     </message>
@@ -8701,25 +8727,45 @@ Dateien mit unpassendem Datum/Zeit</translation>
         <translation>Ausrüstung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="48"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.ui" line="74"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="49"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
         <source>Add cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="56"/>
         <source>Weights</source>
         <translation>Blei</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/>
         <source>Add weight system</source>
         <translation>Gewicht hinzufügen</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="60"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="64"/>
+        <source>Undo</source>
+        <translation>Rückgängig</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="306"/>
+        <source>Warning: edited %1 dives</source>
+        <translation>Achtung: %1 Tauchgänge editiert</translation>
+    </message>
 </context>
 <context>
     <name>TabDiveExtraInfo</name>
@@ -8827,29 +8873,29 @@ Dateien mit unpassendem Datum/Zeit</translation>
         <translation>Wassertyp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="75"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="76"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
         <source>sec</source>
         <translation>s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>d</source>
         <translation>d</translation>
     </message>
@@ -9340,7 +9386,7 @@ den folgenden Gasen gemischt werden:
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/>
         <source>%1click to visit %2</source>
         <translation>%1klicken, um zu %2 gehen</translation>
     </message>
@@ -9647,13 +9693,13 @@ Sprache: %1</translation>
     <name>VideoFrameExtractor</name>
     <message>
         <location filename="../core/videoframeextractor.cpp" line="93"/>
-        <source>ffmpeg failed to start - video thumbnail creation suspended</source>
-        <translation>ffmpeg konnte nicht gestartet werden - Standbildberechnung ausgesetzt</translation>
+        <source>ffmpeg failed to start - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/videoframeextractor.cpp" line="99"/>
-        <source>failed waiting for ffmpeg - video thumbnail creation suspended</source>
-        <translation>Zu lange auf ffmpeg gewartet - Standbildberechnung ausgesetzt</translation>
+        <location filename="../core/videoframeextractor.cpp" line="97"/>
+        <source>Failed waiting for ffmpeg - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -9720,12 +9766,12 @@ Sprache: %1</translation>
         <translation>Hochladen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="331"/>
         <source>Operation timed out</source>
         <translation>Die Aktion hat zu lange gedauert</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="352"/>
         <source>Transferring data...</source>
         <translation>Daten werden übertragen...</translation>
     </message>
@@ -9743,7 +9789,7 @@ Sprache: %1</translation>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-models/weightmodel.cpp" line="72"/>
+        <location filename="../qt-models/weightmodel.cpp" line="71"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
@@ -9751,15 +9797,15 @@ Sprache: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2198"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2200"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Diese Funktion ist für den ausgewählten Tauchcomputer noch nicht verfügbar.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2195"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2179"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2189"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2197"/>
         <source>Failed!</source>
         <translation>Fehlgeschlagen!</translation>
     </message>
@@ -9880,7 +9926,7 @@ Durchschnitt</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="801"/>
+        <location filename="../core/libdivecomputer.c" line="802"/>
         <source>Error parsing the header</source>
         <translation>Fehler beim Lesen der Kopfdaten</translation>
     </message>
@@ -9891,7 +9937,7 @@ Durchschnitt</translation>
         <location filename="../core/cochran.c" line="306"/>
         <location filename="../core/cochran.c" line="312"/>
         <location filename="../core/cochran.c" line="382"/>
-        <location filename="../core/libdivecomputer.c" line="244"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deco stop</source>
         <translation>Deko-Stopp</translation>
     </message>
@@ -9899,7 +9945,7 @@ Durchschnitt</translation>
         <location filename="../core/cochran.c" line="333"/>
         <location filename="../core/cochran.c" line="387"/>
         <location filename="../core/import-csv.c" line="680"/>
-        <location filename="../core/libdivecomputer.c" line="246"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>ascent</source>
         <translation>Aufstieg</translation>
     </message>
@@ -9911,20 +9957,20 @@ Durchschnitt</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="345"/>
-        <location filename="../core/libdivecomputer.c" line="262"/>
+        <location filename="../core/libdivecomputer.c" line="263"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="350"/>
-        <location filename="../core/libdivecomputer.c" line="261"/>
+        <location filename="../core/libdivecomputer.c" line="262"/>
         <source>maxdepth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="355"/>
         <location filename="../core/cochran.c" line="401"/>
-        <location filename="../core/libdivecomputer.c" line="263"/>
+        <location filename="../core/libdivecomputer.c" line="264"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
@@ -9933,8 +9979,8 @@ Durchschnitt</translation>
         <location filename="../core/cochran.c" line="411"/>
         <location filename="../core/cochran.c" line="418"/>
         <location filename="../core/import-csv.c" line="761"/>
-        <location filename="../core/libdivecomputer.c" line="254"/>
-        <location filename="../core/libdivecomputer.c" line="268"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="269"/>
         <location filename="../core/plannernotes.c" line="54"/>
         <source>gaschange</source>
         <translation>Gaswechsel</translation>
@@ -9942,101 +9988,101 @@ Durchschnitt</translation>
     <message>
         <location filename="../core/cochran.c" line="367"/>
         <location filename="../core/cochran.c" line="406"/>
-        <location filename="../core/libdivecomputer.c" line="245"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>rbt</source>
         <translation>Nullzeit</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="376"/>
         <location filename="../core/cochran.c" line="423"/>
-        <location filename="../core/libdivecomputer.c" line="247"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>ceiling</source>
         <translation>Auftauchgrenze</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="392"/>
-        <location filename="../core/libdivecomputer.c" line="249"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>transmitter</source>
         <translation>Sender</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="255"/>
+        <location filename="../core/datatrak.c" line="256"/>
         <source>clear</source>
         <translation>löschen</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="258"/>
+        <location filename="../core/datatrak.c" line="259"/>
         <source>misty</source>
         <translation>diesig</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="261"/>
+        <location filename="../core/datatrak.c" line="262"/>
         <source>fog</source>
         <translation>Nebel</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="264"/>
+        <location filename="../core/datatrak.c" line="265"/>
         <source>rain</source>
         <translation>Regen</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="267"/>
+        <location filename="../core/datatrak.c" line="268"/>
         <source>storm</source>
         <translation>Sturm</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="270"/>
+        <location filename="../core/datatrak.c" line="271"/>
         <source>snow</source>
         <translation>Schnee</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="290"/>
+        <location filename="../core/datatrak.c" line="291"/>
         <source>No suit</source>
         <translation>Kein Anzug</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="293"/>
+        <location filename="../core/datatrak.c" line="294"/>
         <source>Shorty</source>
         <translation>Shorty</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="296"/>
+        <location filename="../core/datatrak.c" line="297"/>
         <source>Combi</source>
         <translation>Kombi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="299"/>
+        <location filename="../core/datatrak.c" line="300"/>
         <source>Wet suit</source>
         <translation>Nasstauchanzug</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="302"/>
+        <location filename="../core/datatrak.c" line="303"/>
         <source>Semidry suit</source>
         <translation>Halbtrockentauchanzug</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="305"/>
+        <location filename="../core/datatrak.c" line="306"/>
         <source>Dry suit</source>
         <translation>Trockentauchanzug</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="364"/>
+        <location filename="../core/datatrak.c" line="365"/>
         <source>no stop</source>
         <translation>kein Stopp</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="366"/>
+        <location filename="../core/datatrak.c" line="367"/>
         <location filename="../core/tag.c" line="20"/>
         <source>deco</source>
         <translation>Deko</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="368"/>
+        <location filename="../core/datatrak.c" line="369"/>
         <source>single ascent</source>
         <translation>einzelner Aufstieg</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="370"/>
+        <location filename="../core/datatrak.c" line="371"/>
         <source>multiple ascent</source>
         <translation>mehrere Aufstiege</translation>
     </message>
@@ -10046,117 +10092,117 @@ Durchschnitt</translation>
         <translation>süss</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="372"/>
+        <location filename="../core/datatrak.c" line="373"/>
         <source>fresh water</source>
         <translation>Süßwasser</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="374"/>
+        <location filename="../core/datatrak.c" line="375"/>
         <source>salt water</source>
         <translation>Salzwasser</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="395"/>
+        <location filename="../core/datatrak.c" line="396"/>
         <source>sight seeing</source>
         <translation>Besichtigung</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="397"/>
+        <location filename="../core/datatrak.c" line="398"/>
         <source>club dive</source>
         <translation>Vereinstauchgang</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="399"/>
+        <location filename="../core/datatrak.c" line="400"/>
         <location filename="../core/tag.c" line="19"/>
         <source>instructor</source>
         <translation>Tauchlehrer</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="401"/>
+        <location filename="../core/datatrak.c" line="402"/>
         <source>instruction</source>
         <translation>Anweisung</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="403"/>
+        <location filename="../core/datatrak.c" line="404"/>
         <location filename="../core/tag.c" line="18"/>
         <source>night</source>
         <translation>Nacht</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="405"/>
+        <location filename="../core/datatrak.c" line="406"/>
         <location filename="../core/tag.c" line="16"/>
         <source>cave</source>
         <translation>Höhle</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="407"/>
+        <location filename="../core/datatrak.c" line="408"/>
         <location filename="../core/tag.c" line="15"/>
         <source>ice</source>
         <translation>Eis</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="409"/>
+        <location filename="../core/datatrak.c" line="410"/>
         <source>search</source>
         <translation>suchen</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="416"/>
+        <location filename="../core/datatrak.c" line="417"/>
         <location filename="../core/tag.c" line="16"/>
         <source>wreck</source>
         <translation>Wrack</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="418"/>
+        <location filename="../core/datatrak.c" line="419"/>
         <location filename="../core/tag.c" line="17"/>
         <source>river</source>
         <translation>Fluss</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="420"/>
+        <location filename="../core/datatrak.c" line="421"/>
         <location filename="../core/tag.c" line="14"/>
         <source>drift</source>
         <translation>Strömung</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="422"/>
+        <location filename="../core/datatrak.c" line="423"/>
         <location filename="../core/tag.c" line="19"/>
         <source>photo</source>
         <translation>Foto</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="424"/>
+        <location filename="../core/datatrak.c" line="425"/>
         <source>other</source>
         <translation>sonstige</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="434"/>
+        <location filename="../core/datatrak.c" line="435"/>
         <source>Other activities</source>
         <translation>Sonstige Aktivitäten</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="458"/>
+        <location filename="../core/datatrak.c" line="459"/>
         <source>Datatrak/Wlog notes</source>
         <translation>Datatrak/Wlog-Hinweise</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="502"/>
+        <location filename="../core/datatrak.c" line="503"/>
         <source>[Warning] Manual dive # %d
 </source>
         <translation>[Warnung] Manuelle Tauchgangsnummer %d
 </translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="528"/>
+        <location filename="../core/datatrak.c" line="529"/>
         <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="576"/>
+        <location filename="../core/datatrak.c" line="577"/>
         <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="589"/>
+        <location filename="../core/datatrak.c" line="590"/>
         <source>Error: no dive</source>
         <translation>Fehler: kein Tauchgang</translation>
     </message>
@@ -10206,30 +10252,30 @@ Durchschnitt</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>OC-gas</source>
         <translation>OC-Gas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>diluent</source>
         <translation>Diluent</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../core/equipment.c" line="92"/>
-        <location filename="../core/planner.c" line="1158"/>
-        <location filename="../core/planner.c" line="1161"/>
+        <location filename="../core/equipment.c" line="45"/>
+        <location filename="../core/equipment.c" line="144"/>
+        <location filename="../core/planner.c" line="1179"/>
+        <location filename="../core/planner.c" line="1182"/>
         <source>oxygen</source>
         <translation>Sauerstoff</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>not used</source>
         <translation>unbenutzt</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="32"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>Open circuit</source>
         <translation>Offenes System</translation>
     </message>
@@ -10242,17 +10288,17 @@ Durchschnitt</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="622"/>
-        <location filename="../core/qthelper.cpp" line="814"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
+        <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="625"/>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1251"/>
+        <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>
@@ -10263,25 +10309,25 @@ Durchschnitt</translation>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1275"/>
+        <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="538"/>
-        <location filename="../core/qthelper.cpp" line="553"/>
-        <location filename="../core/qthelper.cpp" line="732"/>
-        <location filename="../core/qthelper.cpp" line="1227"/>
+        <location filename="../core/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="541"/>
-        <location filename="../core/qthelper.cpp" line="555"/>
-        <location filename="../core/qthelper.cpp" line="734"/>
-        <location filename="../core/qthelper.cpp" line="1226"/>
+        <location filename="../core/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>
@@ -10307,86 +10353,86 @@ Durchschnitt</translation>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="564"/>
-        <location filename="../core/qthelper.cpp" line="574"/>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <location filename="../core/qthelper.cpp" line="1203"/>
+        <location filename="../core/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="132"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="133"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="562"/>
-        <location filename="../core/qthelper.cpp" line="572"/>
-        <location filename="../core/qthelper.cpp" line="787"/>
-        <location filename="../core/qthelper.cpp" line="1202"/>
+        <location filename="../core/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="130"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="131"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="678"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1154"/>
-        <location filename="../core/planner.c" line="1157"/>
+        <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="90"/>
+        <location filename="../core/equipment.c" line="142"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="205"/>
+        <location filename="../core/equipment.c" line="252"/>
         <source>integrated</source>
         <translation>integriert</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="206"/>
+        <location filename="../core/equipment.c" line="253"/>
         <source>belt</source>
         <translation>Gürtel</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="207"/>
+        <location filename="../core/equipment.c" line="254"/>
         <source>ankle</source>
         <translation>Fussblei</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="208"/>
+        <location filename="../core/equipment.c" line="255"/>
         <source>backplate</source>
         <translation>Backplate</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="209"/>
+        <location filename="../core/equipment.c" line="256"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="116"/>
+        <location filename="../core/file.c" line="117"/>
         <source>No dives in the input file &apos;%s&apos;</source>
         <translation>Keine Tauchgänge in der Datei &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="334"/>
+        <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="53"/>
+        <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="221"/>
+        <location filename="../core/file.c" line="222"/>
         <source>Cannot open CSV file %s; please use Import log file dialog</source>
         <comment>'Import log file' should be the same text as corresponding label in Import menu</comment>
         <translation>Kann CSV-Datei %s nicht öffnen; bitte verwenden Sie den Dialog Logbuchdatei importieren</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="336"/>
+        <location filename="../core/file.c" line="337"/>
         <source>Empty file &apos;%s&apos;</source>
         <translation>Leere Datei &apos;%s&apos;</translation>
     </message>
@@ -10437,287 +10483,287 @@ Durchschnitt</translation>
         <translation>Kein Profil in &apos;%s&apos; gefunden.</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="83"/>
+        <location filename="../core/git-access.c" line="85"/>
         <source>Checkout from storage (%lu/%lu)</source>
         <translation>Laden aus dem Cloud-Speicher (%lu/%lu)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="114"/>
+        <location filename="../core/git-access.c" line="116"/>
         <source>Transfer from storage (%d/%d)</source>
         <translation>Übertragung aus dem Cloud-Speicher (%d/%d)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="126"/>
+        <location filename="../core/git-access.c" line="128"/>
         <source>Transfer to storage (%d/%d)</source>
         <translation>Übertragung in den Cloud-Speicher (%d/%d)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="162"/>
+        <location filename="../core/git-access.c" line="164"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation>Lokales Cacheverzeichnis %s beschädigt - kann nicht mit dem Subsurface-Cloud-Speicher synchronisieren</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="185"/>
-        <location filename="../core/git-access.c" line="205"/>
+        <location filename="../core/git-access.c" line="187"/>
+        <location filename="../core/git-access.c" line="207"/>
         <source>Could not update local cache to newer remote data</source>
         <translation>Lokaler Cache konnte nicht auf neuere externe Daten aktualisiert werden</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="198"/>
+        <location filename="../core/git-access.c" line="200"/>
         <source>Subsurface cloud storage corrupted</source>
         <translation>Subsurface-Cloud-Speicher beschädigt</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="334"/>
+        <location filename="../core/git-access.c" line="336"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
         <translation>Subsurface-Cloud-Speicher konnte nicht aktualisiert werden, versuchen Sie es später noch einmal</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="394"/>
+        <location filename="../core/git-access.c" line="396"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
         <translation>Die lokale Version ist von der Servierversion divergiert. Fehler: Vereinigung fehlgeschlagen (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="424"/>
+        <location filename="../core/git-access.c" line="426"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
         <translation>Die lokale Version weicht von der Serverversion ab. Lokale und entfernte Änderungen können nicht zusammengeführt werden.</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="458"/>
+        <location filename="../core/git-access.c" line="460"/>
         <source>Remote storage and local data diverged</source>
         <translation>Lokale Version und Serverversion sind verschieden</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="461"/>
+        <location filename="../core/git-access.c" line="463"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
         <translation>Die lokale Version weicht von der Servierversion ab. Fehler: Schreiben der Daten fehlgeschlagen (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="470"/>
+        <location filename="../core/git-access.c" line="472"/>
         <source>Problems with local cache of Subsurface cloud data</source>
         <translation>Probleme mit dem lokalen Cache der Subsurface-Cloud-Daten</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="471"/>
+        <location filename="../core/git-access.c" line="473"/>
         <source>Moved cache data to %s. Please try the operation again.</source>
         <translation>Cachedaten auf %s verschoben. Bitte versuchen Sie es erneut.</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="518"/>
+        <location filename="../core/git-access.c" line="520"/>
         <source>Update local storage to match cloud storage</source>
         <translation>Gleiche lokalen an den Cloud-Speicher an</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="526"/>
+        <location filename="../core/git-access.c" line="528"/>
         <source>Push local changes to cloud storage</source>
         <translation>Übertrage lokale Veränderungen in die Cloud</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="544"/>
+        <location filename="../core/git-access.c" line="546"/>
         <source>Try to merge local changes into cloud storage</source>
         <translation>Veruche lokale Änderungen in die Cloud einzufügen.</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="586"/>
+        <location filename="../core/git-access.c" line="588"/>
         <source>Store data into cloud storage</source>
         <translation>Speichere Daten in die Cloud</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="610"/>
+        <location filename="../core/git-access.c" line="612"/>
         <source>Sync with cloud storage</source>
         <translation>Mit Cloud-Speicher synchronisieren</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="637"/>
+        <location filename="../core/git-access.c" line="639"/>
         <source>Can&apos;t reach cloud server, working with local data</source>
         <translation>Cloud-Server nicht erreichbar, arbeite mit lokalen Daten</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="650"/>
+        <location filename="../core/git-access.c" line="652"/>
         <source>Successful cloud connection, fetch remote</source>
         <translation>Erfolgreiche Cloud-Verbindung, hole Daten</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="669"/>
+        <location filename="../core/git-access.c" line="671"/>
         <source>Done syncing with cloud storage</source>
         <translation>Synchronisierung mit Cloud erfolgreich</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="804"/>
+        <location filename="../core/git-access.c" line="806"/>
         <source>Error connecting to Subsurface cloud storage</source>
         <translation>Fehler beim Verbinden mit dem Subsurface-Cloud-Speicher</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="807"/>
+        <location filename="../core/git-access.c" line="809"/>
         <source>git clone of %s failed (%s)</source>
         <translation>git clone von %s fehlgeschlagen (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="833"/>
+        <location filename="../core/git-access.c" line="835"/>
         <source>Synchronising data file</source>
         <translation>Datendatei wird synchronisiert</translation>
     </message>
     <message>
-        <location filename="../core/import-divinglog.c" line="315"/>
-        <location filename="../core/libdivecomputer.c" line="230"/>
+        <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/uemis-downloader.c" line="197"/>
+        <location filename="../core/uemis-downloader.c" line="199"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="243"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>none</source>
         <translation>keine</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="248"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>workload</source>
         <translation>Arbeit</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="250"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>violation</source>
         <translation>Verletzung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="251"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>bookmark</source>
         <translation>Markierung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="252"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>surface</source>
         <translation>Oberfläche</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="253"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>safety stop</source>
         <translation>Sicherheitsstopp</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>safety stop (voluntary)</source>
         <translation>Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="256"/>
+        <location filename="../core/libdivecomputer.c" line="257"/>
         <source>safety stop (mandatory)</source>
         <translation>Sicherheitsstopp (obligatorisch)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="257"/>
+        <location filename="../core/libdivecomputer.c" line="258"/>
         <source>deepstop</source>
         <translation>Tiefen-Stopp</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="258"/>
+        <location filename="../core/libdivecomputer.c" line="259"/>
         <source>ceiling (safety stop)</source>
         <translation>Auftauchgrenze (Sicherheitsstopp)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="259"/>
+        <location filename="../core/libdivecomputer.c" line="260"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>unterhalb Dekotiefe</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="260"/>
+        <location filename="../core/libdivecomputer.c" line="261"/>
         <source>divetime</source>
         <translation>Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="264"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>airtime</source>
         <translation>verbleibende Atemzeit</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="265"/>
+        <location filename="../core/libdivecomputer.c" line="266"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="266"/>
+        <location filename="../core/libdivecomputer.c" line="267"/>
         <source>heading</source>
         <translation>Richtung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="267"/>
+        <location filename="../core/libdivecomputer.c" line="268"/>
         <source>tissue level warning</source>
         <translation>Gewebewarnung</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="277"/>
+        <location filename="../core/libdivecomputer.c" line="278"/>
         <source>invalid event number</source>
         <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="613"/>
+        <location filename="../core/libdivecomputer.c" line="614"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="631"/>
+        <location filename="../core/libdivecomputer.c" line="632"/>
         <source>Dive %d: %s</source>
         <translation>Tauchgang %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="637"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error parsing the divetime</source>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
+        <location filename="../core/libdivecomputer.c" line="648"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="661"/>
+        <location filename="../core/libdivecomputer.c" line="662"/>
         <source>Error parsing temperature</source>
         <translation>Fehler beim Lesen der Temperatur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="680"/>
+        <location filename="../core/libdivecomputer.c" line="681"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="691"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="700"/>
+        <location filename="../core/libdivecomputer.c" line="701"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
+        <location filename="../core/libdivecomputer.c" line="724"/>
         <source>Error obtaining dive mode</source>
         <translation>Fehler beim Auslesen des Modus des Tauchcomputers</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="745"/>
+        <location filename="../core/libdivecomputer.c" line="746"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen des Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="771"/>
+        <location filename="../core/libdivecomputer.c" line="772"/>
         <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="777"/>
+        <location filename="../core/libdivecomputer.c" line="778"/>
         <source>Error registering the data</source>
         <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="808"/>
+        <location filename="../core/libdivecomputer.c" line="809"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Segmente</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="815"/>
+        <location filename="../core/libdivecomputer.c" line="816"/>
         <source>Already downloaded dive at %s</source>
         <translation>Tauchgang bereits heruntergeladen am %s</translation>
     </message>
@@ -10778,56 +10824,56 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans
         <translation>Keine neuen Tauchgänge vom Tauchcomputer heruntergeladen</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="175"/>
-        <location filename="../core/parse-xml.c" line="1207"/>
+        <location filename="../core/load-git.c" line="186"/>
+        <location filename="../core/parse-xml.c" line="1208"/>
         <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="201"/>
-        <location filename="../core/parse.c" line="442"/>
+        <location filename="../core/load-git.c" line="211"/>
+        <location filename="../core/parse.c" line="443"/>
         <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="1664"/>
+        <location filename="../core/load-git.c" line="1659"/>
         <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="1668"/>
+        <location filename="../core/load-git.c" line="1663"/>
         <source>Successfully opened dive data</source>
         <translation>Tauchdaten erfolgreich geöffnet</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="128"/>
-        <location filename="../core/ostctools.c" line="159"/>
+        <location filename="../core/ostctools.c" line="129"/>
+        <location filename="../core/ostctools.c" line="160"/>
         <source>Unknown DC in dive %d</source>
         <translation>Unbekannter TC in Tauchgang %d</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="171"/>
+        <location filename="../core/ostctools.c" line="172"/>
         <source>Error - %s - parsing dive %d</source>
         <translation>Fehler - %s - Tauchgang %d wird gelesen</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="400"/>
+        <location filename="../core/parse-xml.c" line="401"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Unverständliche Prozentangabe %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="1664"/>
+        <location filename="../core/parse-xml.c" line="1663"/>
         <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="2257"/>
+        <location filename="../core/parse-xml.c" line="2256"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kann Stylesheet %s nicht öffnen</translation>
     </message>
@@ -10854,7 +10900,7 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans
     </message>
     <message>
         <location filename="../core/planner.c" line="300"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="193"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="194"/>
         <source>SP change</source>
         <translation>Setpoint-Änderung</translation>
     </message>
@@ -11121,17 +11167,17 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans
         <translation>niedriger pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="881"/>
+        <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="1162"/>
+        <location filename="../core/planner.c" line="1183"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1406"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -11140,91 +11186,91 @@ Tiefe: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1407"/>
+        <location filename="../core/profile.c" line="1417"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1413"/>
+        <location filename="../core/profile.c" line="1423"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1416"/>
+        <location filename="../core/profile.c" line="1426"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>AMV: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1418"/>
+        <location filename="../core/profile.c" line="1428"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1427"/>
+        <location filename="../core/profile.c" line="1437"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1430"/>
+        <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="1470"/>
+        <location filename="../core/profile.c" line="1480"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1462"/>
+        <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="1403"/>
+        <location filename="../core/profile.c" line="1413"/>
         <source>P: %d%s (%s)
 </source>
         <translation>P: %d%s (%s)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1420"/>
+        <location filename="../core/profile.c" line="1430"/>
         <source>pO₂: %.2fbar
 </source>
         <translation>pO₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1422"/>
+        <location filename="../core/profile.c" line="1432"/>
         <source>SCR ΔpO₂: %.2fbar
 </source>
         <translation>SCR ΔpO₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1425"/>
+        <location filename="../core/profile.c" line="1435"/>
         <source>pN₂: %.2fbar
 </source>
         <translation>pN₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1439"/>
+        <location filename="../core/profile.c" line="1449"/>
         <source>EAD: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -11233,7 +11279,7 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1445"/>
+        <location filename="../core/profile.c" line="1455"/>
         <source>END: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -11242,378 +11288,378 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1450"/>
+        <location filename="../core/profile.c" line="1460"/>
         <source>Density: %.1fg/ℓ
 </source>
         <translation>Dichte: %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1465"/>
+        <location filename="../core/profile.c" line="1475"/>
         <source>Safety stop: unknown time @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1473"/>
+        <location filename="../core/profile.c" line="1483"/>
         <source>Deco: unknown time @ %.0f%s
 </source>
         <translation>Deko: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1477"/>
+        <location filename="../core/profile.c" line="1487"/>
         <source>In deco
 </source>
         <translation>In Deko
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1479"/>
+        <location filename="../core/profile.c" line="1489"/>
         <source>NDL: %umin
 </source>
         <translation>Nullzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1482"/>
+        <location filename="../core/profile.c" line="1492"/>
         <source>TTS: %umin
 </source>
         <translation>Gesamtaufstiegszeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1485"/>
+        <location filename="../core/profile.c" line="1495"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1493"/>
+        <location filename="../core/profile.c" line="1503"/>
         <source>In deco (calc)
 </source>
         <translation>Deko (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1496"/>
+        <location filename="../core/profile.c" line="1506"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>Nullzeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1498"/>
+        <location filename="../core/profile.c" line="1508"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>Nullzeit: &gt; 2h (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1502"/>
+        <location filename="../core/profile.c" line="1512"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>Gesamtaufstiegszeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1504"/>
+        <location filename="../core/profile.c" line="1514"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>Gesamtaufstiegszeit: &gt; 2h (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1517"/>
         <source>RBT: %umin
 </source>
         <translation>Restgrundzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1510"/>
+        <location filename="../core/profile.c" line="1520"/>
         <source>Surface GF %.0f%%
 </source>
         <translation>Oberflächen GF %.0f%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1513"/>
+        <location filename="../core/profile.c" line="1523"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berechnete Auftauchgrenze %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1529"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Gewebe %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1536"/>
         <source>ICD in leading tissue
 </source>
         <translation>ICD im Führungsgewebe
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1528"/>
+        <location filename="../core/profile.c" line="1538"/>
         <source>heart rate: %d
 </source>
         <translation>Puslrate: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1530"/>
+        <location filename="../core/profile.c" line="1540"/>
         <source>bearing: %d
 </source>
         <translation>Peilung: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1533"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Durchschnittstiefe bis hier %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1630"/>
+        <location filename="../core/profile.c" line="1640"/>
         <source>ΔT:%d:%02dmin</source>
         <translation>ΔT:%d:%02dmin</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1634"/>
+        <location filename="../core/profile.c" line="1644"/>
         <source>%s ΔD:%.1f%s</source>
         <translation>%s ΔD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1638"/>
+        <location filename="../core/profile.c" line="1648"/>
         <source>%s ↓D:%.1f%s</source>
         <translation>%s ↓D:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1642"/>
+        <location filename="../core/profile.c" line="1652"/>
         <source>%s ↑D:%.1f%s</source>
         <translation>%s ↑D:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1646"/>
+        <location filename="../core/profile.c" line="1656"/>
         <source>%s øD:%.1f%s
 </source>
         <translation>%s øD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1650"/>
+        <location filename="../core/profile.c" line="1660"/>
         <source>%s ↓V:%.2f%s</source>
         <translation>%s ↓V:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1654"/>
+        <location filename="../core/profile.c" line="1664"/>
         <source>%s ↑V:%.2f%s</source>
         <translation>%s ↑V:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1658"/>
+        <location filename="../core/profile.c" line="1668"/>
         <source>%s øV:%.2f%s</source>
         <translation>%s øV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1665"/>
+        <location filename="../core/profile.c" line="1675"/>
         <source>%s ΔP:%d%s</source>
         <translation>%s ΔP:%d%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1690"/>
+        <location filename="../core/profile.c" line="1700"/>
         <source>%s SAC:%.*f%s/min</source>
         <translation>%s AMV:%.*f%s/min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="68"/>
+        <location filename="../core/qthelper.cpp" line="70"/>
         <source>%1km</source>
         <translation>%1 km</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="70"/>
+        <location filename="../core/qthelper.cpp" line="72"/>
         <source>%1m</source>
         <translation>%1 m</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="74"/>
+        <location filename="../core/qthelper.cpp" line="76"/>
         <source>%1mi</source>
         <translation>%1 mi</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="76"/>
+        <location filename="../core/qthelper.cpp" line="78"/>
         <source>%1yd</source>
         <translation>%1 yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="234"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="236"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="235"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="237"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="236"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="238"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="237"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="239"/>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="583"/>
-        <location filename="../core/qthelper.cpp" line="760"/>
+        <location filename="../core/qthelper.cpp" line="585"/>
+        <location filename="../core/qthelper.cpp" line="762"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="586"/>
-        <location filename="../core/qthelper.cpp" line="762"/>
+        <location filename="../core/qthelper.cpp" line="588"/>
+        <location filename="../core/qthelper.cpp" line="764"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="837"/>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="841"/>
         <source>EAN</source>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="914"/>
+        <location filename="../core/qthelper.cpp" line="916"/>
         <source>more than %1 days</source>
         <translation>mehr als %1 Tage</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="960"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <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="1179"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>OXYGEN</source>
         <translation>SAUERSTOFF</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1274"/>
+        <location filename="../core/qthelper.cpp" line="1276"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="480"/>
-        <location filename="../core/save-html.c" line="564"/>
-        <location filename="../core/worldmap-save.c" line="114"/>
+        <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>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="499"/>
+        <location filename="../core/save-html.c" line="501"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="500"/>
+        <location filename="../core/save-html.c" line="502"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="501"/>
+        <location filename="../core/save-html.c" line="503"/>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="502"/>
+        <location filename="../core/save-html.c" line="504"/>
         <source>Location</source>
         <translation>Position</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="503"/>
+        <location filename="../core/save-html.c" line="505"/>
         <source>Air temp.</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="504"/>
+        <location filename="../core/save-html.c" line="506"/>
         <source>Water temp.</source>
         <translation>Wassertemp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="507"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="506"/>
+        <location filename="../core/save-html.c" line="508"/>
         <source>Expand all</source>
         <translation>Alle ausfalten</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="507"/>
+        <location filename="../core/save-html.c" line="509"/>
         <source>Collapse all</source>
         <translation>Alle einfalten</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="508"/>
+        <location filename="../core/save-html.c" line="510"/>
         <source>Trips</source>
         <translation>Reisen</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../core/save-html.c" line="511"/>
         <source>Statistics</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="510"/>
+        <location filename="../core/save-html.c" line="512"/>
         <source>Advanced search</source>
         <translation>Erweiterte Suche</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="513"/>
+        <location filename="../core/save-html.c" line="515"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="514"/>
+        <location filename="../core/save-html.c" line="516"/>
         <source>Visibility</source>
         <translation>Sicht</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="515"/>
+        <location filename="../core/save-html.c" line="517"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="516"/>
+        <location filename="../core/save-html.c" line="518"/>
         <source>Divemaster</source>
         <translation>Tauchgruppenleiter</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="517"/>
+        <location filename="../core/save-html.c" line="519"/>
         <source>Buddy</source>
         <translation>Tauchpartner</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="518"/>
+        <location filename="../core/save-html.c" line="520"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
@@ -11624,180 +11670,180 @@ EADD: %d%s / %.1fg/ℓ
     </message>
     <message>
         <location filename="../core/divesite-helper.cpp" line="29"/>
-        <location filename="../core/save-html.c" line="519"/>
+        <location filename="../core/save-html.c" line="521"/>
         <source>Tags</source>
         <translation>Stichwörter</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="520"/>
+        <location filename="../core/save-html.c" line="522"/>
         <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="521"/>
+        <location filename="../core/save-html.c" line="523"/>
         <source>Show more details</source>
         <translation>Mehr Details anzeigen</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="524"/>
+        <location filename="../core/save-html.c" line="526"/>
         <source>Yearly statistics</source>
         <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="525"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Year</source>
         <translation>Jahr</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="526"/>
+        <location filename="../core/save-html.c" line="528"/>
         <source>Total time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="527"/>
+        <location filename="../core/save-html.c" line="529"/>
         <source>Average time</source>
         <translation>Durchschnittszeit</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="528"/>
+        <location filename="../core/save-html.c" line="530"/>
         <source>Shortest time</source>
         <translation>Kürzeste Zeit</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="529"/>
+        <location filename="../core/save-html.c" line="531"/>
         <source>Longest time</source>
         <translation>Längste Zeit</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="530"/>
+        <location filename="../core/save-html.c" line="532"/>
         <source>Average depth</source>
         <translation>Durchschnittstiefe</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="531"/>
+        <location filename="../core/save-html.c" line="533"/>
         <source>Min. depth</source>
         <translation>Min. Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="532"/>
+        <location filename="../core/save-html.c" line="534"/>
         <source>Max. depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="533"/>
+        <location filename="../core/save-html.c" line="535"/>
         <source>Average SAC</source>
         <translation>Durchschnittliches AMV</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="534"/>
+        <location filename="../core/save-html.c" line="536"/>
         <source>Min. SAC</source>
         <translation>Min. AMV</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="537"/>
         <source>Max. SAC</source>
         <translation>Max. AMV</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="536"/>
+        <location filename="../core/save-html.c" line="538"/>
         <source>Average temp.</source>
         <translation>Durchschnittstemp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="537"/>
+        <location filename="../core/save-html.c" line="539"/>
         <source>Min. temp.</source>
         <translation>Min. Temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="538"/>
+        <location filename="../core/save-html.c" line="540"/>
         <source>Max. temp.</source>
         <translation>Max. Temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="539"/>
+        <location filename="../core/save-html.c" line="541"/>
         <source>Back to list</source>
         <translation>Zurück zur Liste</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="542"/>
+        <location filename="../core/save-html.c" line="544"/>
         <source>Dive #</source>
         <translation>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="543"/>
+        <location filename="../core/save-html.c" line="545"/>
         <source>Dive profile</source>
         <translation>Tauchprofil</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="544"/>
+        <location filename="../core/save-html.c" line="546"/>
         <source>Dive information</source>
         <translation>Tauchinformation</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="545"/>
+        <location filename="../core/save-html.c" line="547"/>
         <source>Dive equipment</source>
         <translation>Tauchausrüstung</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="555"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="547"/>
+        <location filename="../core/save-html.c" line="549"/>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="550"/>
         <source>Work pressure</source>
         <translation>Arbeitsdruck</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="549"/>
+        <location filename="../core/save-html.c" line="551"/>
         <source>Start pressure</source>
         <translation>Anfangsdruck</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="550"/>
+        <location filename="../core/save-html.c" line="552"/>
         <source>End pressure</source>
         <translation>Enddruck</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="551"/>
+        <location filename="../core/save-html.c" line="553"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="552"/>
+        <location filename="../core/save-html.c" line="554"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="554"/>
+        <location filename="../core/save-html.c" line="556"/>
         <source>Events</source>
         <translation>Ereignisse</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="555"/>
+        <location filename="../core/save-html.c" line="557"/>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="556"/>
+        <location filename="../core/save-html.c" line="558"/>
         <source>Value</source>
         <translation>Wert</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="557"/>
+        <location filename="../core/save-html.c" line="559"/>
         <source>Coordinates</source>
         <translation>Koordinaten</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="558"/>
+        <location filename="../core/save-html.c" line="560"/>
         <source>Dive status</source>
         <translation>Tauchstatus</translation>
     </message>
@@ -11817,17 +11863,17 @@ EADD: %d%s / %.1fg/ℓ
         <translation>Alle (nach Temperatur)</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/dive.c" line="29"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="34"/>
+        <location filename="../core/dive.c" line="30"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="35"/>
+        <location filename="../core/dive.c" line="31"/>
         <source>Freedive</source>
         <translation>Freitauchgang</translation>
     </message>
@@ -11837,67 +11883,67 @@ EADD: %d%s / %.1fg/ℓ
         <translation>Alle (nach Reisen)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="32"/>
+        <location filename="../core/uemis-downloader.c" line="34"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
@@ -11906,7 +11952,7 @@ Bitte den Tauchcomputer ausstecken, wieder einstecken
 und auf Wiederholen klicken</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="33"/>
+        <location filename="../core/uemis-downloader.c" line="35"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
@@ -11915,104 +11961,104 @@ Bitte den Tauchcomputer ausstecken, wieder einstecken
 und auf Wiederholen klicken</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="34"/>
+        <location filename="../core/uemis-downloader.c" line="36"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation>Unvollständiger Schreibvorgang der req.txt Datei
 Ist der Uemis Zürich korrekt verbunden?</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="35"/>
+        <location filename="../core/uemis-downloader.c" line="37"/>
         <source>No dives to download.</source>
         <translation>Keine Tauchgänge zum Herunterladen.</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="499"/>
+        <location filename="../core/uemis-downloader.c" line="501"/>
         <source>%s %s</source>
         <translation>%s %s</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="535"/>
+        <location filename="../core/uemis-downloader.c" line="537"/>
         <source>data</source>
         <translation>Daten</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="563"/>
+        <location filename="../core/uemis-downloader.c" line="565"/>
         <source>dive log #</source>
         <translation>Logbuch #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="565"/>
+        <location filename="../core/uemis-downloader.c" line="567"/>
         <source>dive spot #</source>
         <translation>Tauchplatz #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="567"/>
+        <location filename="../core/uemis-downloader.c" line="569"/>
         <source>details for #</source>
         <translation>Details für #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>wetsuit</source>
         <translation>Nass-Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>semidry</source>
         <translation>halbtrocken</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>drysuit</source>
         <translation>Trockentauchanzug</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>shorty</source>
         <translation>Shorty</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>vest</source>
         <translation>Weste</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>long john</source>
         <translation>Latzhose</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>jacket</source>
         <translation>Jacke</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>full suit</source>
         <translation>vollständiger Tauchanzug</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>2 pcs full suit</source>
         <translation>Zweiteiler</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>membrane</source>
         <translation>Membran</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1336"/>
+        <location filename="../core/uemis-downloader.c" line="1338"/>
         <source>Initialise communication</source>
         <translation>Kommunikation einleiten</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1339"/>
+        <location filename="../core/uemis-downloader.c" line="1341"/>
         <source>Uemis init failed</source>
         <translation>Uemis-Initialisierung fehlgeschlagen</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1351"/>
+        <location filename="../core/uemis-downloader.c" line="1353"/>
         <source>Start download</source>
         <translation>Beginne mit dem Herunterladen</translation>
     </message>
@@ -12107,76 +12153,76 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Batteriealarm</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="42"/>
+        <location filename="../core/worldmap-save.c" line="44"/>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="44"/>
+        <location filename="../core/worldmap-save.c" line="46"/>
         <source>Time:</source>
         <translation>Zeit:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="46"/>
+        <location filename="../core/worldmap-save.c" line="48"/>
         <source>Duration:</source>
         <translation>Dauer:</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
+        <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="140"/>
-        <location filename="../core/worldmap-save.c" line="47"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
+        <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="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="140"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="100"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
+        <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="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/qthelper.h" line="76"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
+        <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="152"/>
+        <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="50"/>
+        <location filename="../core/worldmap-save.c" line="52"/>
         <source>Max. depth:</source>
         <translation>Max. Tiefe:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="53"/>
+        <location filename="../core/worldmap-save.c" line="55"/>
         <source>Air temp.:</source>
         <translation>Lufttemp.:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="56"/>
+        <location filename="../core/worldmap-save.c" line="58"/>
         <source>Water temp.:</source>
         <translation>Wassertemp.:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="58"/>
+        <location filename="../core/worldmap-save.c" line="60"/>
         <source>Location:</source>
         <translation>Position:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="62"/>
+        <location filename="../core/worldmap-save.c" line="64"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
@@ -12296,27 +12342,27 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Großstadt</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="914"/>
+        <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="923"/>
+        <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="956"/>
+        <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="1207"/>
+        <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="1661"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1658"/>
         <source>modechange</source>
         <translation>Tauchmoduswechsel</translation>
     </message>
@@ -12331,57 +12377,57 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
         <translation>Diesen Punkt entfernen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="558"/>
+        <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>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="46"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/>
         <source>Average</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="49"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
         <source>Minimum</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="52"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
         <source>Maximum</source>
         <translation>Max.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="406"/>
         <source>Invalid response from server</source>
         <translation>Ungültige Serverantwort</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/>
+        <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>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/>
+        <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>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/>
+        <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>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="121"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="122"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="743"/>
+        <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>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="864"/>
+        <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>
     </message>
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index 76990bc35..fc6a7b981 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -401,7 +401,7 @@
 <context>
     <name>CloudStorageAuthenticate</name>
     <message>
-        <location filename="../core/cloudstorage.cpp" line="65"/>
+        <location filename="../core/cloudstorage.cpp" line="66"/>
         <source>Cloud account verification required, enter PIN in preferences</source>
         <translation type="unfinished"/>
     </message>
@@ -607,7 +607,7 @@
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="78"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="92"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -680,7 +680,7 @@
 <context>
     <name>Command::EditAirTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="227"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="241"/>
         <source>air temperature</source>
         <translation type="unfinished"/>
     </message>
@@ -688,7 +688,7 @@
 <context>
     <name>Command::EditAtmPress</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="272"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="286"/>
         <source>Atm. pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -696,7 +696,7 @@
 <context>
     <name>Command::EditDepth</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="320"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="334"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
@@ -704,7 +704,7 @@
 <context>
     <name>Command::EditDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="342"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="356"/>
         <source>dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -760,7 +760,7 @@
 <context>
     <name>Command::EditDuration</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="296"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="310"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
@@ -768,7 +768,7 @@
 <context>
     <name>Command::EditNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="142"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="156"/>
         <source>notes</source>
         <translation type="unfinished"/>
     </message>
@@ -776,7 +776,7 @@
 <context>
     <name>Command::EditRating</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="185"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="199"/>
         <source>rating</source>
         <translation type="unfinished"/>
     </message>
@@ -784,7 +784,7 @@
 <context>
     <name>Command::EditSuit</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="164"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="178"/>
         <source>suit</source>
         <translation type="unfinished"/>
     </message>
@@ -816,7 +816,7 @@
 <context>
     <name>Command::EditVisibility</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="206"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="220"/>
         <source>visibility</source>
         <translation type="unfinished"/>
     </message>
@@ -824,7 +824,7 @@
 <context>
     <name>Command::EditWaterTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="251"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="265"/>
         <source>water temperature</source>
         <translation type="unfinished"/>
     </message>
@@ -928,42 +928,42 @@
 <context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="181"/>
+        <location filename="../core/configuredivecomputer.cpp" line="183"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="197"/>
+        <location filename="../core/configuredivecomputer.cpp" line="199"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="545"/>
+        <location filename="../core/configuredivecomputer.cpp" line="547"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="554"/>
+        <location filename="../core/configuredivecomputer.cpp" line="556"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="563"/>
+        <location filename="../core/configuredivecomputer.cpp" line="565"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="572"/>
+        <location filename="../core/configuredivecomputer.cpp" line="574"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="588"/>
+        <location filename="../core/configuredivecomputer.cpp" line="590"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ne mogu kreirati libdivecomputer kontekst</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="607"/>
+        <location filename="../core/configuredivecomputer.cpp" line="609"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2530,93 +2530,93 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Type</source>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Size</source>
         <translation>Veličina</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Work press.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../qt-models/cylindermodel.cpp" line="26"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="27"/>
         <source>Start press.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>End press.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>O₂%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Deco switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Bot. MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>MND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Use</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="53"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="54"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="57"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="58"/>
         <source>ℓ</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="237"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="238"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="248"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="249"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="250"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="251"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max. depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="252"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max. depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="235"/>
+        <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 type="unfinished"/>
     </message>
@@ -2624,54 +2624,54 @@
 <context>
     <name>DiveComponentSelection</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="487"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
         <source>Dive site: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="489"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
         <source>Dive master: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="491"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
         <source>Buddy: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="493"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="494"/>
         <source>Rating: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="495"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="496"/>
         <source>Visibility: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="497"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="498"/>
         <source>Notes:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="499"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="500"/>
         <source>Suit: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="501"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="511"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="512"/>
         <source>Cylinders:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="519"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/>
         <source>Weights:
 </source>
         <translation type="unfinished"/>
@@ -3044,38 +3044,38 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="186"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="187"/>
         <source> (cyl. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="190"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
         <source>ICD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
         <source>ΔHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="193"/>
         <source>ΔN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="213"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="214"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="215"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> započni</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="217"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> završi</translation>
@@ -3084,27 +3084,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="37"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="38"/>
         <source>Date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="39"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="40"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="41"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="42"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -3169,117 +3169,117 @@ GPS location:</source>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="911"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="912"/>
         <source>Expand all</source>
         <translation>Otvori sve</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="913"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="914"/>
         <source>Collapse all</source>
         <translation>Zatvori sve grupe</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="918"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="921"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="923"/>
         <source>Create new trip above</source>
         <translation>Kreiraj novu grupu iznad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="937"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="938"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="939"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="940"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="943"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
         <source>Merge trip with trip above</source>
         <translation>Spoji s grupom iznad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="945"/>
         <source>Merge trip with trip below</source>
         <translation>Spoji s grupom ispod</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="948"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="949"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="950"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="951"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="954"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="955"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="956"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
         <source>Load media from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="961"/>
         <source>Load media from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="986"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="987"/>
         <source>Open media files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="989"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
         <source>Media files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
         <source>Image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
         <source>Video files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="993"/>
         <source>All files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="1041"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="1042"/>
         <source>%1 does not appear to be an image</source>
         <translation type="unfinished"/>
     </message>
@@ -3545,7 +3545,7 @@ GPS location:</source>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="559"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="113"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="115"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="412"/>
         <source>Light</source>
         <translation type="unfinished"/>
@@ -3557,157 +3557,157 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
         <source>Send the dive data to dive-share.appspot.com website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
         <source>Subsurface dive sites native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
         <source>Write dive as TeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
         <source>Write dive as LaTeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
         <source>Write the profile image as PNG file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="108"/>
         <source>Write profile data to a CSV file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
         <source>UDDF files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/>
         <source>CSV files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="201"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="203"/>
         <source>HTML files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="165"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Subsurface files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="175"/>
         <source>Export Subsurface dive sites XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>TeX files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="164"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="182"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>Export to TeX file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Save profile image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="196"/>
         <source>Save profile data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="200"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="202"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="214"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="216"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="249"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="482"/>
+        <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 type="unfinished"/>
     </message>
@@ -4090,62 +4090,62 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="171"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="173"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="272"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="274"/>
         <source>cyl.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="378"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="390"/>
         <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1026"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1028"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1032"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1034"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1035"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1037"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1082"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1084"/>
         <source>Stop times</source>
         <translation type="unfinished"/>
     </message>
@@ -4355,12 +4355,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveSiteSortedModel</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="271"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="278"/>
         <source>Delete dive site?</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../qt-models/divelocationmodel.cpp" line="272"/>
+        <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 type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -4369,186 +4369,186 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModelBase</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="66"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="274"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="314"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="208"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="275"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="315"/>
         <source>#</source>
         <translation>Br.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="276"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="316"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="277"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="317"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="211"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="278"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="318"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="279"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="282"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="322"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="283"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="323"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="217"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="324"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="325"/>
         <source>Temp.(°%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="288"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="328"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="222"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="289"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="329"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="223"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="290"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="330"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="291"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="331"/>
         <source>Cylinder</source>
         <translation>Boca</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="225"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="292"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="332"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="293"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="333"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="231"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="296"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="338"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="297"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="234"/>
         <source>Max. CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="300"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="342"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="301"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="343"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="237"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="344"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="238"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="345"/>
         <source>Media before/during/after dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="304"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="240"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="305"/>
         <source>Country</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="241"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="306"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="346"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="242"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="307"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="347"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="243"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="308"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="348"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="309"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="349"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="280"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="281"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="284"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
         <source>Temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="286"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="287"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="294"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="295"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="298"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="340"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="299"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="341"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="302"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="303"/>
         <source>Media</source>
         <translation type="unfinished"/>
     </message>
@@ -4556,106 +4556,106 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="243"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="279"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="526"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="717"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="528"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="719"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="562"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="594"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="635"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="667"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="669"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="681"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="683"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="693"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="682"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="692"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="694"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="160"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="491"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="162"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="493"/>
         <source>No dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="170"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="172"/>
         <source>Stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="180"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="182"/>
         <source>Failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="718"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="720"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="731"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="734"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="737"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="739"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="740"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="742"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="751"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="753"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -4720,73 +4720,73 @@ Existing Site</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="86"/>
         <source>Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="90"/>
         <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="177"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="180"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="202"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="205"/>
         <source>Connecting to dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/>
         <source>Error</source>
         <translation>Greška</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Garmin dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/>
         <source>Cancel download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="430"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="455"/>
         <source>Choose file for dive computer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="431"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
         <source>Log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="481"/>
         <source>Choose file for dive computer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="457"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="482"/>
         <source>Dump files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="485"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="510"/>
         <source>Retry download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="444"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="469"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="445"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="470"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
@@ -4873,10 +4873,10 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="303"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="392"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="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="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="334"/>
         <source>Download</source>
         <translation type="unfinished"/>
@@ -4907,7 +4907,7 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="340"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
@@ -4923,72 +4923,72 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/>
         <source> Vendor name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="97"/>
         <source>USB device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="105"/>
         <source> Dive Computer:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="145"/>
         <source> Connection:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/>
         <source> Previously used dive computers: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/>
         <source>Retry</source>
         <translation>Pokušaj ponovo</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <source>Quit</source>
         <translation>Izlaz</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="312"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="316"/>
         <source>Rescan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="321"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="325"/>
         <source> Downloaded dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="322"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="326"/>
         <source>Info:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="345"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="349"/>
         <source>force downloading all dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="383"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="387"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="403"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="407"/>
         <source>Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="412"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="416"/>
         <source>Unselect All</source>
         <translation type="unfinished"/>
     </message>
@@ -4996,7 +4996,7 @@ Existing Site</source>
 <context>
     <name>DownloadThread</name>
     <message>
-        <location filename="../core/downloadfromdcthread.cpp" line="101"/>
+        <location filename="../core/downloadfromdcthread.cpp" line="102"/>
         <source>No new dives downloaded from dive computer</source>
         <translation type="unfinished"/>
     </message>
@@ -5004,7 +5004,7 @@ Existing Site</source>
 <context>
     <name>EditBuddies</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="602"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="638"/>
         <source>buddies</source>
         <translation type="unfinished"/>
     </message>
@@ -5012,7 +5012,7 @@ Existing Site</source>
 <context>
     <name>EditDiveMaster</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="625"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="661"/>
         <source>dive master</source>
         <translation type="unfinished"/>
     </message>
@@ -5020,15 +5020,23 @@ Existing Site</source>
 <context>
     <name>EditMode</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="440"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="454"/>
         <source>dive mode</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>EditNumber</name>
+    <message>
+        <location filename="../desktop-widgets/command_edit.cpp" line="475"/>
+        <source>number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditTags</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="570"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="606"/>
         <source>tags</source>
         <translation type="unfinished"/>
     </message>
@@ -5036,7 +5044,7 @@ Existing Site</source>
 <context>
     <name>EditTagsBase</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="511"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="547"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5091,129 +5099,134 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="47"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="41"/>
         <source>Reset / close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="57"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="102"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="123"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="140"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="64"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="58"/>
         <source>People</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="71"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="95"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="147"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="189"/>
+        <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"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="78"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="72"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="85"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="79"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="109"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="103"/>
         <source>From</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="116"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="110"/>
         <source>To</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="133"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="127"/>
         <source>Visibility</source>
         <translation>Vidljivost</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="163"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="157"/>
         <source>Equipment</source>
         <translation>Oprema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="179"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="173"/>
         <source>Water Temp</source>
         <translation>Temperatura vode</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="196"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="190"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="203"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="197"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="210"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="204"/>
         <source>Notes</source>
         <translation>Bilješke</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="217"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="211"/>
         <source>Air Temp</source>
         <translation>Temp. zraka</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="276"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="270"/>
         <source>Logged</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="286"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="280"/>
         <source>Planned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="330"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="310"/>
+        <source>Close filters</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="345"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="364"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="383"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="402"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="421"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="440"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="350"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="369"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="388"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="407"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="426"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="445"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="355"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="374"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="393"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="412"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="431"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="450"/>
+        <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 type="unfinished"/>
     </message>
@@ -5223,7 +5236,6 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="316"/>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="124"/>
         <source>Close and reset filters</source>
         <translation type="unfinished"/>
@@ -5306,12 +5318,12 @@ Existing Site</source>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2225"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2227"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2230"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2232"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -5327,7 +5339,7 @@ Existing Site</source>
 <context>
     <name>GasSelectionModel</name>
     <message>
-        <location filename="../qt-models/models.cpp" line="38"/>
+        <location filename="../qt-models/models.cpp" line="39"/>
         <source>cyl.</source>
         <translation type="unfinished"/>
     </message>
@@ -5371,7 +5383,7 @@ Existing Site</source>
 <context>
     <name>GpsLocation</name>
     <message>
-        <location filename="../core/gpslocation.cpp" line="132"/>
+        <location filename="../core/gpslocation.cpp" line="134"/>
         <source>Unknown GPS location (no GPS source)</source>
         <translation type="unfinished"/>
     </message>
@@ -5585,9 +5597,9 @@ Existing Site</source>
     <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="30"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="504"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="450"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="511"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="512"/>
         <source>Notes</source>
@@ -5613,21 +5625,21 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="110"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="228"/>
+        <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 type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="120"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="229"/>
+        <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 type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="195"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="545"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="498"/>
         <source>Location</source>
         <translation>Lokacija</translation>
@@ -5670,25 +5682,24 @@ Existing Site</source>
         <translation>Vidljivost</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="343"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="402"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="398"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="509"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="412"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="62"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="513"/>
         <source>Equipment</source>
         <translation>Oprema</translation>
@@ -5706,93 +5717,93 @@ Existing Site</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="70"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/>
         <source>Extra Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="64"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="66"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="65"/>
         <source>Statistics</source>
         <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="68"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="67"/>
         <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="71"/>
         <source>Dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="91"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="90"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="95"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="94"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="99"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="731"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="735"/>
         <source>Warning: edited %1 dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="225"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="221"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="226"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="222"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="264"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="260"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="266"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="262"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="494"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="458"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="489"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="491"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="686"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="690"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="687"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="691"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -5860,7 +5871,7 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="494"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="535"/>
         <source>Open</source>
         <translation type="unfinished"/>
@@ -6279,45 +6290,45 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="485"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="532"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1514"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="491"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="691"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="655"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
+        <location filename="../desktop-widgets/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"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="692"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="693"/>
         <source>Trying to merge dives with %1min interval in between</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="256"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
         <source>Template backup created</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="258"/>
         <source>The following backup printing templates were created:
 
 %1
@@ -6331,229 +6342,229 @@ can overwrite them on startup.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="607"/>
         <source>Please save or cancel the current dive edit before going online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="620"/>
         <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="629"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="630"/>
         <source>Failure taking cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="703"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="806"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="857"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="858"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="914"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1669"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1772"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>multiple files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1750"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1766"/>
         <source>Open dive site file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1016"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1017"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1284"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/>
         <source>Dive log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1263"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1543"/>
-        <source>Subsurface files</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
-        <source>Cochran</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1559"/>
+        <source>Subsurface files</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
-        <source>DiveLogs.de</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+        <source>Cochran</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
-        <source>JDiveLog</source>
+        <source>DiveLogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
-        <source>Liquivision</source>
+        <source>JDiveLog</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
-        <source>Suunto</source>
+        <source>Liquivision</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
-        <source>UDCF</source>
+        <source>Suunto</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
-        <source>UDDF</source>
+        <source>UDCF</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
-        <source>XML</source>
+        <source>UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
-        <source>Divesoft</source>
+        <source>XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
-        <source>Datatrak/WLog</source>
+        <source>Divesoft</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
-        <source>MkVI files</source>
+        <source>Datatrak/WLog</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
-        <source>APD log viewer</source>
+        <source>MkVI files</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1276"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
-        <source>OSTCtools</source>
+        <source>APD log viewer</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
+        <source>OSTCtools</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
         <source>DAN DL7</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
         <source>CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/>
         <source>All files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/>
         <source>Dive site files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="618"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1349"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1542"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1558"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1630"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1646"/>
         <source>[local cache for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1631"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1647"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1698"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1699"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1723"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1739"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
@@ -6673,7 +6684,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
 <context>
     <name>PasteDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="728"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="760"/>
         <source>Paste onto %n dive(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
@@ -6906,22 +6917,32 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="14"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Subsurface files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
+        <source>Couldn&apos;t execute ffmpeg at given location. Thumbnailing will not work.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="70"/>
         <source>Select ffmpeg executable</source>
         <translation type="unfinished"/>
     </message>
@@ -7169,7 +7190,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="12"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
@@ -7805,17 +7826,17 @@ Please export this template to a different file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="840"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="837"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1451"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1435"/>
         <source>Make first dive computer</source>
         <translation type="unfinished"/>
     </message>
@@ -7830,103 +7851,103 @@ Please export this template to a different file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1440"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
         <source>Delete this dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1441"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Split this dive computer into own dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1457"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
         <source> (cyl. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1463"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
         <source>Add setpoint change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1465"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1462"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1467"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1464"/>
         <source>Split dive into two</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1477"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
         <source>Change divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1501"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1498"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1505"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1502"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1507"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1517"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1548"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1555"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1545"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1552"/>
         <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1570"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1567"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1630"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1631"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1786"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1783"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1787"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1784"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1792"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1789"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -7934,146 +7955,151 @@ Please export this template to a different file.</source>
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="206"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="207"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="275"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/>
         <source>Open local dive data file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="283"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Opening local data file failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/>
         <source>%1 dives loaded from local dive data file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="425"/>
         <source>Error parsing local storage, giving up</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="427"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="434"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="428"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="504"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="473"/>
         <source>Invalid format for email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="544"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="552"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="559"/>
         <source>No response from cloud server to validate the credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="567"/>
         <source>Incorrect cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="566"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="593"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="600"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="607"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="628"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="634"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="641"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="646"/>
         <source>Cloud credentials valid, loading dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="649"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="656"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="695"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="702"/>
         <source>Loading dives from local storage (&apos;no cloud&apos; mode)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="748"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="766"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="942"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="953"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1479"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1048"/>
+        <source>weight</source>
+        <translation>težina</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1493"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -8089,15 +8115,15 @@ Please export this template to a different file.</source>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2151"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2153"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2148"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2131"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2139"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2150"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -8118,23 +8144,23 @@ Please export this template to a different file.</source>
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="138"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="139"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="90"/>
         <source>New starting number</source>
         <translation>Novi početni broj</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="136"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="137"/>
         <source>New number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="141"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
         <source>Renumber selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="143"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="144"/>
         <source>Renumber all dives</source>
         <translation type="unfinished"/>
     </message>
@@ -8142,7 +8168,7 @@ Please export this template to a different file.</source>
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2248"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2250"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -8451,38 +8477,38 @@ Not all media files have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="284"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="285"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="286"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="287"/>
         <source>Image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="367"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="368"/>
         <source>Selected dive date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="369"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
         <source>First selected dive date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="371"/>
         <source>Last selected dive date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="372"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/>
         <source>
 Files with inappropriate date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="382"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="383"/>
         <source>No Exif date/time found</source>
         <translation type="unfinished"/>
     </message>
@@ -8584,28 +8610,28 @@ Files with inappropriate date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
         <source>Open SmartTrak files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
         <source>SmartTrak files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>All files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>Subsurface files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
         <source>Open Subsurface files</source>
         <translation type="unfinished"/>
     </message>
@@ -8669,25 +8695,45 @@ Files with inappropriate date/time</source>
         <translation>Oprema</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="48"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.ui" line="74"/>
+        <source>Suit</source>
+        <translation>Odijelo</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
         <source>Cylinders</source>
         <translation>Boce</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="49"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="56"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="60"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="64"/>
+        <source>Undo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="306"/>
+        <source>Warning: edited %1 dives</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>TabDiveExtraInfo</name>
@@ -8795,29 +8841,29 @@ Files with inappropriate date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="75"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="76"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>d</source>
         <translation type="unfinished"/>
     </message>
@@ -9306,7 +9352,7 @@ mixed from Air and using:
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
@@ -9608,12 +9654,12 @@ Language: %1</source>
     <name>VideoFrameExtractor</name>
     <message>
         <location filename="../core/videoframeextractor.cpp" line="93"/>
-        <source>ffmpeg failed to start - video thumbnail creation suspended</source>
+        <source>ffmpeg failed to start - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/videoframeextractor.cpp" line="99"/>
-        <source>failed waiting for ffmpeg - video thumbnail creation suspended</source>
+        <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"/>
     </message>
 </context>
@@ -9681,12 +9727,12 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="331"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="352"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -9704,7 +9750,7 @@ Language: %1</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-models/weightmodel.cpp" line="72"/>
+        <location filename="../qt-models/weightmodel.cpp" line="71"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
@@ -9712,15 +9758,15 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2198"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2200"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2195"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2179"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2189"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2197"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -9830,7 +9876,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="801"/>
+        <location filename="../core/libdivecomputer.c" line="802"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -9841,7 +9887,7 @@ Maximum</source>
         <location filename="../core/cochran.c" line="306"/>
         <location filename="../core/cochran.c" line="312"/>
         <location filename="../core/cochran.c" line="382"/>
-        <location filename="../core/libdivecomputer.c" line="244"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deco stop</source>
         <translation>deko zastoj</translation>
     </message>
@@ -9849,7 +9895,7 @@ Maximum</source>
         <location filename="../core/cochran.c" line="333"/>
         <location filename="../core/cochran.c" line="387"/>
         <location filename="../core/import-csv.c" line="680"/>
-        <location filename="../core/libdivecomputer.c" line="246"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>ascent</source>
         <translation>izron</translation>
     </message>
@@ -9861,20 +9907,20 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/cochran.c" line="345"/>
-        <location filename="../core/libdivecomputer.c" line="262"/>
+        <location filename="../core/libdivecomputer.c" line="263"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="350"/>
-        <location filename="../core/libdivecomputer.c" line="261"/>
+        <location filename="../core/libdivecomputer.c" line="262"/>
         <source>maxdepth</source>
         <translation>Max dubina</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="355"/>
         <location filename="../core/cochran.c" line="401"/>
-        <location filename="../core/libdivecomputer.c" line="263"/>
+        <location filename="../core/libdivecomputer.c" line="264"/>
         <source>pO₂</source>
         <translation type="unfinished"/>
     </message>
@@ -9883,8 +9929,8 @@ Maximum</source>
         <location filename="../core/cochran.c" line="411"/>
         <location filename="../core/cochran.c" line="418"/>
         <location filename="../core/import-csv.c" line="761"/>
-        <location filename="../core/libdivecomputer.c" line="254"/>
-        <location filename="../core/libdivecomputer.c" line="268"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="269"/>
         <location filename="../core/plannernotes.c" line="54"/>
         <source>gaschange</source>
         <translation>promjena plina</translation>
@@ -9892,101 +9938,101 @@ Maximum</source>
     <message>
         <location filename="../core/cochran.c" line="367"/>
         <location filename="../core/cochran.c" line="406"/>
-        <location filename="../core/libdivecomputer.c" line="245"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="376"/>
         <location filename="../core/cochran.c" line="423"/>
-        <location filename="../core/libdivecomputer.c" line="247"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>ceiling</source>
         <translation>strop</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="392"/>
-        <location filename="../core/libdivecomputer.c" line="249"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>transmitter</source>
         <translation>odašiljač</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="255"/>
+        <location filename="../core/datatrak.c" line="256"/>
         <source>clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="258"/>
+        <location filename="../core/datatrak.c" line="259"/>
         <source>misty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="261"/>
+        <location filename="../core/datatrak.c" line="262"/>
         <source>fog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="264"/>
+        <location filename="../core/datatrak.c" line="265"/>
         <source>rain</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="267"/>
+        <location filename="../core/datatrak.c" line="268"/>
         <source>storm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="270"/>
+        <location filename="../core/datatrak.c" line="271"/>
         <source>snow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="290"/>
+        <location filename="../core/datatrak.c" line="291"/>
         <source>No suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="293"/>
+        <location filename="../core/datatrak.c" line="294"/>
         <source>Shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="296"/>
+        <location filename="../core/datatrak.c" line="297"/>
         <source>Combi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="299"/>
+        <location filename="../core/datatrak.c" line="300"/>
         <source>Wet suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="302"/>
+        <location filename="../core/datatrak.c" line="303"/>
         <source>Semidry suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="305"/>
+        <location filename="../core/datatrak.c" line="306"/>
         <source>Dry suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="364"/>
+        <location filename="../core/datatrak.c" line="365"/>
         <source>no stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="366"/>
+        <location filename="../core/datatrak.c" line="367"/>
         <location filename="../core/tag.c" line="20"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="368"/>
+        <location filename="../core/datatrak.c" line="369"/>
         <source>single ascent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="370"/>
+        <location filename="../core/datatrak.c" line="371"/>
         <source>multiple ascent</source>
         <translation type="unfinished"/>
     </message>
@@ -9996,116 +10042,116 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="372"/>
+        <location filename="../core/datatrak.c" line="373"/>
         <source>fresh water</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="374"/>
+        <location filename="../core/datatrak.c" line="375"/>
         <source>salt water</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="395"/>
+        <location filename="../core/datatrak.c" line="396"/>
         <source>sight seeing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="397"/>
+        <location filename="../core/datatrak.c" line="398"/>
         <source>club dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="399"/>
+        <location filename="../core/datatrak.c" line="400"/>
         <location filename="../core/tag.c" line="19"/>
         <source>instructor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="401"/>
+        <location filename="../core/datatrak.c" line="402"/>
         <source>instruction</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="403"/>
+        <location filename="../core/datatrak.c" line="404"/>
         <location filename="../core/tag.c" line="18"/>
         <source>night</source>
         <translation>noć</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="405"/>
+        <location filename="../core/datatrak.c" line="406"/>
         <location filename="../core/tag.c" line="16"/>
         <source>cave</source>
         <translation>špilja</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="407"/>
+        <location filename="../core/datatrak.c" line="408"/>
         <location filename="../core/tag.c" line="15"/>
         <source>ice</source>
         <translation>led</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="409"/>
+        <location filename="../core/datatrak.c" line="410"/>
         <source>search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="416"/>
+        <location filename="../core/datatrak.c" line="417"/>
         <location filename="../core/tag.c" line="16"/>
         <source>wreck</source>
         <translation>olupina</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="418"/>
+        <location filename="../core/datatrak.c" line="419"/>
         <location filename="../core/tag.c" line="17"/>
         <source>river</source>
         <translation>rijeka</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="420"/>
+        <location filename="../core/datatrak.c" line="421"/>
         <location filename="../core/tag.c" line="14"/>
         <source>drift</source>
         <translation>drift</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="422"/>
+        <location filename="../core/datatrak.c" line="423"/>
         <location filename="../core/tag.c" line="19"/>
         <source>photo</source>
         <translation>fotografija</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="424"/>
+        <location filename="../core/datatrak.c" line="425"/>
         <source>other</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="434"/>
+        <location filename="../core/datatrak.c" line="435"/>
         <source>Other activities</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="458"/>
+        <location filename="../core/datatrak.c" line="459"/>
         <source>Datatrak/Wlog notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="502"/>
+        <location filename="../core/datatrak.c" line="503"/>
         <source>[Warning] Manual dive # %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="528"/>
+        <location filename="../core/datatrak.c" line="529"/>
         <source>[Error] Out of memory for dive %d. Abort parsing.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="576"/>
+        <location filename="../core/datatrak.c" line="577"/>
         <source>[Error] File is not a DataTrak file. Aborted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="589"/>
+        <location filename="../core/datatrak.c" line="590"/>
         <source>Error: no dive</source>
         <translation type="unfinished"/>
     </message>
@@ -10155,30 +10201,30 @@ Maximum</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>OC-gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>diluent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../core/equipment.c" line="92"/>
-        <location filename="../core/planner.c" line="1158"/>
-        <location filename="../core/planner.c" line="1161"/>
+        <location filename="../core/equipment.c" line="45"/>
+        <location filename="../core/equipment.c" line="144"/>
+        <location filename="../core/planner.c" line="1179"/>
+        <location filename="../core/planner.c" line="1182"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>not used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="32"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
@@ -10191,17 +10237,17 @@ Maximum</source>
         <location filename="../core/plannernotes.c" line="72"/>
         <location filename="../core/plannernotes.c" line="73"/>
         <location filename="../core/plannernotes.c" line="74"/>
-        <location filename="../core/qthelper.cpp" line="622"/>
-        <location filename="../core/qthelper.cpp" line="814"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
+        <location filename="../core/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="625"/>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1251"/>
+        <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>
@@ -10212,25 +10258,25 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1275"/>
+        <location filename="../core/qthelper.cpp" line="1277"/>
         <location filename="../core/units.c" line="65"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="538"/>
-        <location filename="../core/qthelper.cpp" line="553"/>
-        <location filename="../core/qthelper.cpp" line="732"/>
-        <location filename="../core/qthelper.cpp" line="1227"/>
+        <location filename="../core/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="541"/>
-        <location filename="../core/qthelper.cpp" line="555"/>
-        <location filename="../core/qthelper.cpp" line="734"/>
-        <location filename="../core/qthelper.cpp" line="1226"/>
+        <location filename="../core/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>
@@ -10256,86 +10302,86 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="564"/>
-        <location filename="../core/qthelper.cpp" line="574"/>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <location filename="../core/qthelper.cpp" line="1203"/>
+        <location filename="../core/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="132"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="133"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="562"/>
-        <location filename="../core/qthelper.cpp" line="572"/>
-        <location filename="../core/qthelper.cpp" line="787"/>
-        <location filename="../core/qthelper.cpp" line="1202"/>
+        <location filename="../core/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="130"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="131"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="678"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1154"/>
-        <location filename="../core/planner.c" line="1157"/>
+        <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>zrak</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="90"/>
+        <location filename="../core/equipment.c" line="142"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="205"/>
+        <location filename="../core/equipment.c" line="252"/>
         <source>integrated</source>
         <translation>integrirani</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="206"/>
+        <location filename="../core/equipment.c" line="253"/>
         <source>belt</source>
         <translation>pojas</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="207"/>
+        <location filename="../core/equipment.c" line="254"/>
         <source>ankle</source>
         <translation>gležanj</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="208"/>
+        <location filename="../core/equipment.c" line="255"/>
         <source>backplate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="209"/>
+        <location filename="../core/equipment.c" line="256"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="116"/>
+        <location filename="../core/file.c" line="117"/>
         <source>No dives in the input file &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="334"/>
+        <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="53"/>
+        <location filename="../core/ostctools.c" line="54"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Nije uspjelo čitanje &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="221"/>
+        <location filename="../core/file.c" line="222"/>
         <source>Cannot open CSV file %s; please use Import log file dialog</source>
         <comment>'Import log file' should be the same text as corresponding label in Import menu</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="336"/>
+        <location filename="../core/file.c" line="337"/>
         <source>Empty file &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
@@ -10386,287 +10432,287 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="83"/>
+        <location filename="../core/git-access.c" line="85"/>
         <source>Checkout from storage (%lu/%lu)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="114"/>
+        <location filename="../core/git-access.c" line="116"/>
         <source>Transfer from storage (%d/%d)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="126"/>
+        <location filename="../core/git-access.c" line="128"/>
         <source>Transfer to storage (%d/%d)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="162"/>
+        <location filename="../core/git-access.c" line="164"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="185"/>
-        <location filename="../core/git-access.c" line="205"/>
+        <location filename="../core/git-access.c" line="187"/>
+        <location filename="../core/git-access.c" line="207"/>
         <source>Could not update local cache to newer remote data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="198"/>
+        <location filename="../core/git-access.c" line="200"/>
         <source>Subsurface cloud storage corrupted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="334"/>
+        <location filename="../core/git-access.c" line="336"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="394"/>
+        <location filename="../core/git-access.c" line="396"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="424"/>
+        <location filename="../core/git-access.c" line="426"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="458"/>
+        <location filename="../core/git-access.c" line="460"/>
         <source>Remote storage and local data diverged</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="461"/>
+        <location filename="../core/git-access.c" line="463"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="470"/>
+        <location filename="../core/git-access.c" line="472"/>
         <source>Problems with local cache of Subsurface cloud data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="471"/>
+        <location filename="../core/git-access.c" line="473"/>
         <source>Moved cache data to %s. Please try the operation again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="518"/>
+        <location filename="../core/git-access.c" line="520"/>
         <source>Update local storage to match cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="526"/>
+        <location filename="../core/git-access.c" line="528"/>
         <source>Push local changes to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="544"/>
+        <location filename="../core/git-access.c" line="546"/>
         <source>Try to merge local changes into cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="586"/>
+        <location filename="../core/git-access.c" line="588"/>
         <source>Store data into cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="610"/>
+        <location filename="../core/git-access.c" line="612"/>
         <source>Sync with cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="637"/>
+        <location filename="../core/git-access.c" line="639"/>
         <source>Can&apos;t reach cloud server, working with local data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="650"/>
+        <location filename="../core/git-access.c" line="652"/>
         <source>Successful cloud connection, fetch remote</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="669"/>
+        <location filename="../core/git-access.c" line="671"/>
         <source>Done syncing with cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="804"/>
+        <location filename="../core/git-access.c" line="806"/>
         <source>Error connecting to Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="807"/>
+        <location filename="../core/git-access.c" line="809"/>
         <source>git clone of %s failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="833"/>
+        <location filename="../core/git-access.c" line="835"/>
         <source>Synchronising data file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/import-divinglog.c" line="315"/>
-        <location filename="../core/libdivecomputer.c" line="230"/>
+        <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/uemis-downloader.c" line="197"/>
+        <location filename="../core/uemis-downloader.c" line="199"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="243"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>none</source>
         <translation>nijedan</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="248"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>workload</source>
         <translation>opterećenje</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="250"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>violation</source>
         <translation>povreda</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="251"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>bookmark</source>
         <translation>bookmark</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="252"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>surface</source>
         <translation>površina</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="253"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>safety stop</source>
         <translation>sigurnosna stanka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>safety stop (voluntary)</source>
         <translation>sigurnosna stanka (opcionalna)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="256"/>
+        <location filename="../core/libdivecomputer.c" line="257"/>
         <source>safety stop (mandatory)</source>
         <translation>sigurnosna stanka (obavezna)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="257"/>
+        <location filename="../core/libdivecomputer.c" line="258"/>
         <source>deepstop</source>
         <translation>dubinska stanka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="258"/>
+        <location filename="../core/libdivecomputer.c" line="259"/>
         <source>ceiling (safety stop)</source>
         <translation>strop (sigurnosni zastoj)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="259"/>
+        <location filename="../core/libdivecomputer.c" line="260"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="260"/>
+        <location filename="../core/libdivecomputer.c" line="261"/>
         <source>divetime</source>
         <translation>trajanje urona</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="264"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>airtime</source>
         <translation>preostalo trajanje zraka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="265"/>
+        <location filename="../core/libdivecomputer.c" line="266"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="266"/>
+        <location filename="../core/libdivecomputer.c" line="267"/>
         <source>heading</source>
         <translation>kurs</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="267"/>
+        <location filename="../core/libdivecomputer.c" line="268"/>
         <source>tissue level warning</source>
         <translation>upozorenje tkivo</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="277"/>
+        <location filename="../core/libdivecomputer.c" line="278"/>
         <source>invalid event number</source>
         <translation>neispravan broj događaja</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="613"/>
+        <location filename="../core/libdivecomputer.c" line="614"/>
         <source>Error parsing the datetime</source>
         <translation>Greška pri parsiranju datuma i vremena</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="631"/>
+        <location filename="../core/libdivecomputer.c" line="632"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="637"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error parsing the divetime</source>
         <translation>Greška pri parsiranju vremena urona</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
+        <location filename="../core/libdivecomputer.c" line="648"/>
         <source>Error parsing the maxdepth</source>
         <translation>Greška pri parsiranju maksimalne dubine</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="661"/>
+        <location filename="../core/libdivecomputer.c" line="662"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="680"/>
+        <location filename="../core/libdivecomputer.c" line="681"/>
         <source>Error parsing the gas mix count</source>
         <translation>Greška pri parsiranju broja mješavina</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="691"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error obtaining water salinity</source>
         <translation>Greška pri dohvaćanju saliniteta vode</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="700"/>
+        <location filename="../core/libdivecomputer.c" line="701"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
+        <location filename="../core/libdivecomputer.c" line="724"/>
         <source>Error obtaining dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="745"/>
+        <location filename="../core/libdivecomputer.c" line="746"/>
         <source>Error parsing the gas mix</source>
         <translation>Greška pri parsiranju mješavine plinova</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="771"/>
+        <location filename="../core/libdivecomputer.c" line="772"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Ne mogu kreirati parser za %s %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="778"/>
         <source>Error registering the data</source>
         <translation>Greška pri registraciji podataka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="808"/>
+        <location filename="../core/libdivecomputer.c" line="809"/>
         <source>Error parsing the samples</source>
         <translation>Greška pri parsiranju uzoraka</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="815"/>
+        <location filename="../core/libdivecomputer.c" line="816"/>
         <source>Already downloaded dive at %s</source>
         <translation type="unfinished"/>
     </message>
@@ -10724,54 +10770,54 @@ You can create this logfile by selecting the corresponding checkbox in the downl
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="175"/>
-        <location filename="../core/parse-xml.c" line="1207"/>
+        <location filename="../core/load-git.c" line="186"/>
+        <location filename="../core/parse-xml.c" line="1208"/>
         <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="201"/>
-        <location filename="../core/parse.c" line="442"/>
+        <location filename="../core/load-git.c" line="211"/>
+        <location filename="../core/parse.c" line="443"/>
         <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1664"/>
+        <location filename="../core/load-git.c" line="1659"/>
         <source>Load dives from local cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1668"/>
+        <location filename="../core/load-git.c" line="1663"/>
         <source>Successfully opened dive data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="128"/>
-        <location filename="../core/ostctools.c" line="159"/>
+        <location filename="../core/ostctools.c" line="129"/>
+        <location filename="../core/ostctools.c" line="160"/>
         <source>Unknown DC in dive %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="171"/>
+        <location filename="../core/ostctools.c" line="172"/>
         <source>Error - %s - parsing dive %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="400"/>
+        <location filename="../core/parse-xml.c" line="401"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Neobično očitanje postotka %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="1664"/>
+        <location filename="../core/parse-xml.c" line="1663"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Nije uspjelo parsiranje &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2257"/>
+        <location filename="../core/parse-xml.c" line="2256"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -10798,7 +10844,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl
     </message>
     <message>
         <location filename="../core/planner.c" line="300"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="193"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="194"/>
         <source>SP change</source>
         <translation type="unfinished"/>
     </message>
@@ -11065,460 +11111,460 @@ You can create this logfile by selecting the corresponding checkbox in the downl
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="881"/>
+        <location filename="../core/planner.c" line="900"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1162"/>
+        <location filename="../core/planner.c" line="1183"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1406"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1407"/>
+        <location filename="../core/profile.c" line="1417"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1413"/>
+        <location filename="../core/profile.c" line="1423"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1416"/>
+        <location filename="../core/profile.c" line="1426"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1418"/>
+        <location filename="../core/profile.c" line="1428"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1427"/>
+        <location filename="../core/profile.c" line="1437"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1430"/>
+        <location filename="../core/profile.c" line="1440"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1470"/>
+        <location filename="../core/profile.c" line="1480"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1462"/>
+        <location filename="../core/profile.c" line="1472"/>
         <source>Safety stop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1403"/>
+        <location filename="../core/profile.c" line="1413"/>
         <source>P: %d%s (%s)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1420"/>
+        <location filename="../core/profile.c" line="1430"/>
         <source>pO₂: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1422"/>
+        <location filename="../core/profile.c" line="1432"/>
         <source>SCR ΔpO₂: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1425"/>
+        <location filename="../core/profile.c" line="1435"/>
         <source>pN₂: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1439"/>
+        <location filename="../core/profile.c" line="1449"/>
         <source>EAD: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1445"/>
+        <location filename="../core/profile.c" line="1455"/>
         <source>END: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1450"/>
+        <location filename="../core/profile.c" line="1460"/>
         <source>Density: %.1fg/ℓ
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1465"/>
+        <location filename="../core/profile.c" line="1475"/>
         <source>Safety stop: unknown time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1473"/>
+        <location filename="../core/profile.c" line="1483"/>
         <source>Deco: unknown time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1477"/>
+        <location filename="../core/profile.c" line="1487"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1479"/>
+        <location filename="../core/profile.c" line="1489"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1482"/>
+        <location filename="../core/profile.c" line="1492"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1485"/>
+        <location filename="../core/profile.c" line="1495"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1493"/>
+        <location filename="../core/profile.c" line="1503"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1496"/>
+        <location filename="../core/profile.c" line="1506"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1498"/>
+        <location filename="../core/profile.c" line="1508"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1502"/>
+        <location filename="../core/profile.c" line="1512"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1504"/>
+        <location filename="../core/profile.c" line="1514"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1517"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1510"/>
+        <location filename="../core/profile.c" line="1520"/>
         <source>Surface GF %.0f%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1513"/>
+        <location filename="../core/profile.c" line="1523"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1529"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1536"/>
         <source>ICD in leading tissue
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1528"/>
+        <location filename="../core/profile.c" line="1538"/>
         <source>heart rate: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1530"/>
+        <location filename="../core/profile.c" line="1540"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1533"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1630"/>
+        <location filename="../core/profile.c" line="1640"/>
         <source>ΔT:%d:%02dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1634"/>
+        <location filename="../core/profile.c" line="1644"/>
         <source>%s ΔD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1638"/>
+        <location filename="../core/profile.c" line="1648"/>
         <source>%s ↓D:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1642"/>
+        <location filename="../core/profile.c" line="1652"/>
         <source>%s ↑D:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1646"/>
+        <location filename="../core/profile.c" line="1656"/>
         <source>%s øD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1650"/>
+        <location filename="../core/profile.c" line="1660"/>
         <source>%s ↓V:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1654"/>
+        <location filename="../core/profile.c" line="1664"/>
         <source>%s ↑V:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1658"/>
+        <location filename="../core/profile.c" line="1668"/>
         <source>%s øV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1665"/>
+        <location filename="../core/profile.c" line="1675"/>
         <source>%s ΔP:%d%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1690"/>
+        <location filename="../core/profile.c" line="1700"/>
         <source>%s SAC:%.*f%s/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="68"/>
+        <location filename="../core/qthelper.cpp" line="70"/>
         <source>%1km</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="70"/>
+        <location filename="../core/qthelper.cpp" line="72"/>
         <source>%1m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="74"/>
+        <location filename="../core/qthelper.cpp" line="76"/>
         <source>%1mi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="76"/>
+        <location filename="../core/qthelper.cpp" line="78"/>
         <source>%1yd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="234"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="236"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="235"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="237"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="236"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="238"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="237"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="239"/>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="583"/>
-        <location filename="../core/qthelper.cpp" line="760"/>
+        <location filename="../core/qthelper.cpp" line="585"/>
+        <location filename="../core/qthelper.cpp" line="762"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="586"/>
-        <location filename="../core/qthelper.cpp" line="762"/>
+        <location filename="../core/qthelper.cpp" line="588"/>
+        <location filename="../core/qthelper.cpp" line="764"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="837"/>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>AIR</source>
         <translation>Zrak</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="841"/>
         <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="914"/>
+        <location filename="../core/qthelper.cpp" line="916"/>
         <source>more than %1 days</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="960"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1274"/>
+        <location filename="../core/qthelper.cpp" line="1276"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="480"/>
-        <location filename="../core/save-html.c" line="564"/>
-        <location filename="../core/worldmap-save.c" line="114"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="499"/>
+        <location filename="../core/save-html.c" line="501"/>
         <source>Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="500"/>
+        <location filename="../core/save-html.c" line="502"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="501"/>
+        <location filename="../core/save-html.c" line="503"/>
         <source>Time</source>
         <translation>Vrijeme</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="502"/>
+        <location filename="../core/save-html.c" line="504"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="503"/>
+        <location filename="../core/save-html.c" line="505"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="504"/>
+        <location filename="../core/save-html.c" line="506"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="507"/>
         <source>Dives</source>
         <translation>Uroni</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="506"/>
+        <location filename="../core/save-html.c" line="508"/>
         <source>Expand all</source>
         <translation>Otvori sve</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="507"/>
+        <location filename="../core/save-html.c" line="509"/>
         <source>Collapse all</source>
         <translation>Zatvori sve grupe</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="508"/>
+        <location filename="../core/save-html.c" line="510"/>
         <source>Trips</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../core/save-html.c" line="511"/>
         <source>Statistics</source>
         <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="510"/>
+        <location filename="../core/save-html.c" line="512"/>
         <source>Advanced search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="513"/>
+        <location filename="../core/save-html.c" line="515"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="514"/>
+        <location filename="../core/save-html.c" line="516"/>
         <source>Visibility</source>
         <translation>Vidljivost</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="515"/>
+        <location filename="../core/save-html.c" line="517"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="516"/>
+        <location filename="../core/save-html.c" line="518"/>
         <source>Divemaster</source>
         <translation>Voditelj</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="517"/>
+        <location filename="../core/save-html.c" line="519"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="518"/>
+        <location filename="../core/save-html.c" line="520"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
@@ -11529,180 +11575,180 @@ EADD: %d%s / %.1fg/ℓ
     </message>
     <message>
         <location filename="../core/divesite-helper.cpp" line="29"/>
-        <location filename="../core/save-html.c" line="519"/>
+        <location filename="../core/save-html.c" line="521"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="520"/>
+        <location filename="../core/save-html.c" line="522"/>
         <location filename="../smtk-import/smartrak.c" line="257"/>
         <location filename="../smtk-import/smartrak.c" line="330"/>
         <source>Notes</source>
         <translation>Bilješke</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="521"/>
+        <location filename="../core/save-html.c" line="523"/>
         <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="524"/>
+        <location filename="../core/save-html.c" line="526"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="525"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Year</source>
         <translation>Godina</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="526"/>
+        <location filename="../core/save-html.c" line="528"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="527"/>
+        <location filename="../core/save-html.c" line="529"/>
         <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="528"/>
+        <location filename="../core/save-html.c" line="530"/>
         <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="529"/>
+        <location filename="../core/save-html.c" line="531"/>
         <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="530"/>
+        <location filename="../core/save-html.c" line="532"/>
         <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="531"/>
+        <location filename="../core/save-html.c" line="533"/>
         <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="532"/>
+        <location filename="../core/save-html.c" line="534"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="533"/>
+        <location filename="../core/save-html.c" line="535"/>
         <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="534"/>
+        <location filename="../core/save-html.c" line="536"/>
         <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="537"/>
         <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="536"/>
+        <location filename="../core/save-html.c" line="538"/>
         <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="537"/>
+        <location filename="../core/save-html.c" line="539"/>
         <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="538"/>
+        <location filename="../core/save-html.c" line="540"/>
         <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="539"/>
+        <location filename="../core/save-html.c" line="541"/>
         <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="542"/>
+        <location filename="../core/save-html.c" line="544"/>
         <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="543"/>
+        <location filename="../core/save-html.c" line="545"/>
         <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="544"/>
+        <location filename="../core/save-html.c" line="546"/>
         <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="545"/>
+        <location filename="../core/save-html.c" line="547"/>
         <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="555"/>
         <source>Type</source>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="547"/>
+        <location filename="../core/save-html.c" line="549"/>
         <source>Size</source>
         <translation>Veličina</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="550"/>
         <source>Work pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="549"/>
+        <location filename="../core/save-html.c" line="551"/>
         <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="550"/>
+        <location filename="../core/save-html.c" line="552"/>
         <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="551"/>
+        <location filename="../core/save-html.c" line="553"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="552"/>
+        <location filename="../core/save-html.c" line="554"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="554"/>
+        <location filename="../core/save-html.c" line="556"/>
         <source>Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="555"/>
+        <location filename="../core/save-html.c" line="557"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="556"/>
+        <location filename="../core/save-html.c" line="558"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="557"/>
+        <location filename="../core/save-html.c" line="559"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="558"/>
+        <location filename="../core/save-html.c" line="560"/>
         <source>Dive status</source>
         <translation type="unfinished"/>
     </message>
@@ -11722,17 +11768,17 @@ EADD: %d%s / %.1fg/ℓ
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/dive.c" line="29"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="34"/>
+        <location filename="../core/dive.c" line="30"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="35"/>
+        <location filename="../core/dive.c" line="31"/>
         <source>Freedive</source>
         <translation type="unfinished"/>
     </message>
@@ -11742,177 +11788,177 @@ EADD: %d%s / %.1fg/ℓ
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jan</source>
         <translation>Sij</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Feb</source>
         <translation>Velj</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Mar</source>
         <translation>Ožu</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Apr</source>
         <translation>Tra</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>May</source>
         <translation>Svi</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jun</source>
         <translation>Lip</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Jul</source>
         <translation>Srp</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Aug</source>
         <translation>Kol</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Sep</source>
         <translation>Ruj</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Oct</source>
         <translation>Lis</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Nov</source>
         <translation>Stu</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Dec</source>
         <translation>Pro</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="32"/>
+        <location filename="../core/uemis-downloader.c" line="34"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="33"/>
+        <location filename="../core/uemis-downloader.c" line="35"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="34"/>
+        <location filename="../core/uemis-downloader.c" line="36"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="35"/>
+        <location filename="../core/uemis-downloader.c" line="37"/>
         <source>No dives to download.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="499"/>
+        <location filename="../core/uemis-downloader.c" line="501"/>
         <source>%s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="535"/>
+        <location filename="../core/uemis-downloader.c" line="537"/>
         <source>data</source>
         <translation>podaci</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="563"/>
+        <location filename="../core/uemis-downloader.c" line="565"/>
         <source>dive log #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="565"/>
+        <location filename="../core/uemis-downloader.c" line="567"/>
         <source>dive spot #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="567"/>
+        <location filename="../core/uemis-downloader.c" line="569"/>
         <source>details for #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>wetsuit</source>
         <translation>mokro odijelo</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>semidry</source>
         <translation>polusuho</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>drysuit</source>
         <translation>suho odijelo</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>vest</source>
         <translation>jakna</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>jacket</source>
         <translation>kompenzator plovnosti</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>full suit</source>
         <translation>puno odijelo</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>2 pcs full suit</source>
         <translation>dvodjelno odijelo</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1336"/>
+        <location filename="../core/uemis-downloader.c" line="1338"/>
         <source>Initialise communication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1339"/>
+        <location filename="../core/uemis-downloader.c" line="1341"/>
         <source>Uemis init failed</source>
         <translation>Uemis greška pri inicijalizaciji</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1351"/>
+        <location filename="../core/uemis-downloader.c" line="1353"/>
         <source>Start download</source>
         <translation>Započni preuzimanje</translation>
     </message>
@@ -12007,76 +12053,76 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="42"/>
+        <location filename="../core/worldmap-save.c" line="44"/>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="44"/>
+        <location filename="../core/worldmap-save.c" line="46"/>
         <source>Time:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="46"/>
+        <location filename="../core/worldmap-save.c" line="48"/>
         <source>Duration:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
+        <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="140"/>
-        <location filename="../core/worldmap-save.c" line="47"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
+        <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="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="140"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="100"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/qthelper.h" line="76"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="152"/>
+        <location filename="../core/divelogexportlogic.cpp" line="153"/>
         <source>Cannot find a folder called &apos;theme&apos; in the standard locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="50"/>
+        <location filename="../core/worldmap-save.c" line="52"/>
         <source>Max. depth:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="53"/>
+        <location filename="../core/worldmap-save.c" line="55"/>
         <source>Air temp.:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="56"/>
+        <location filename="../core/worldmap-save.c" line="58"/>
         <source>Water temp.:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="58"/>
+        <location filename="../core/worldmap-save.c" line="60"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="62"/>
+        <location filename="../core/worldmap-save.c" line="64"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
@@ -12196,27 +12242,27 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="914"/>
+        <location filename="../core/save-git.c" line="916"/>
         <source>Start saving data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="923"/>
+        <location filename="../core/save-git.c" line="925"/>
         <source>Start saving dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="956"/>
+        <location filename="../core/save-git.c" line="958"/>
         <source>Done creating local cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="1207"/>
+        <location filename="../core/save-git.c" line="1209"/>
         <source>Preparing to save data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1661"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1658"/>
         <source>modechange</source>
         <translation type="unfinished"/>
     </message>
@@ -12231,57 +12277,57 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="558"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="559"/>
         <source>Don&apos;t save an empty log to the cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="46"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/>
         <source>Average</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="49"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
         <source>Minimum</source>
         <translation>Min.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="52"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
         <source>Maximum</source>
         <translation>Max.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="406"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="414"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="460"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="467"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="121"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="122"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="743"/>
+        <location filename="../core/save-xml.c" line="749"/>
         <source>Failed to save dives to %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="864"/>
+        <location filename="../core/save-xml.c" line="871"/>
         <source>Failed to save divesites to %s (%s)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts
index bb6910c1b..ae2feacbe 100644
--- a/translations/subsurface_hu.ts
+++ b/translations/subsurface_hu.ts
@@ -403,7 +403,7 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>CloudStorageAuthenticate</name>
     <message>
-        <location filename="../core/cloudstorage.cpp" line="65"/>
+        <location filename="../core/cloudstorage.cpp" line="66"/>
         <source>Cloud account verification required, enter PIN in preferences</source>
         <translation>Felhő hozzáférés hitelesítés szükséges add meg a PIN-t a beállításokban</translation>
     </message>
@@ -609,7 +609,7 @@ Nyomd meg a mentés gombot.</translation>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="78"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="92"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -682,7 +682,7 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>Command::EditAirTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="227"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="241"/>
         <source>air temperature</source>
         <translation type="unfinished"/>
     </message>
@@ -690,7 +690,7 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>Command::EditAtmPress</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="272"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="286"/>
         <source>Atm. pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -698,7 +698,7 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>Command::EditDepth</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="320"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="334"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
@@ -706,7 +706,7 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>Command::EditDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="342"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="356"/>
         <source>dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -762,7 +762,7 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>Command::EditDuration</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="296"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="310"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
@@ -770,7 +770,7 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>Command::EditNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="142"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="156"/>
         <source>notes</source>
         <translation type="unfinished"/>
     </message>
@@ -778,7 +778,7 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>Command::EditRating</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="185"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="199"/>
         <source>rating</source>
         <translation type="unfinished"/>
     </message>
@@ -786,7 +786,7 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>Command::EditSuit</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="164"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="178"/>
         <source>suit</source>
         <translation type="unfinished"/>
     </message>
@@ -818,7 +818,7 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>Command::EditVisibility</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="206"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="220"/>
         <source>visibility</source>
         <translation type="unfinished"/>
     </message>
@@ -826,7 +826,7 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>Command::EditWaterTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="251"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="265"/>
         <source>water temperature</source>
         <translation type="unfinished"/>
     </message>
@@ -930,42 +930,42 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="181"/>
+        <location filename="../core/configuredivecomputer.cpp" line="183"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Nem menthető a biztonsági fájl %1. Hiba üzenet: %2</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="197"/>
+        <location filename="../core/configuredivecomputer.cpp" line="199"/>
         <source>Could not open backup file: %1</source>
         <translation>Nem nyitható meg a biztonsági mentés: %1</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="545"/>
+        <location filename="../core/configuredivecomputer.cpp" line="547"/>
         <source>Dive computer details read successfully</source>
         <translation>Búvárkomputer részletei sikeresen kiolvasva</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="554"/>
+        <location filename="../core/configuredivecomputer.cpp" line="556"/>
         <source>Setting successfully written to device</source>
         <translation>Beállítások sikeresen az eszközre írva</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="563"/>
+        <location filename="../core/configuredivecomputer.cpp" line="565"/>
         <source>Device firmware successfully updated</source>
         <translation>Eszköz firmware-e sikeresen frissítve</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="572"/>
+        <location filename="../core/configuredivecomputer.cpp" line="574"/>
         <source>Device settings successfully reset</source>
         <translation>Az eszköz beállításai sikeresen alaphelyzetbe állítva</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="588"/>
+        <location filename="../core/configuredivecomputer.cpp" line="590"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="607"/>
+        <location filename="../core/configuredivecomputer.cpp" line="609"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>A kapcsolat nem létrehozható a búvárkomputerrel</translation>
     </message>
@@ -2532,93 +2532,93 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Type</source>
         <translation>Típus</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Size</source>
         <translation>Méret</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Work press.</source>
         <translation>Munka nyomás</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../qt-models/cylindermodel.cpp" line="26"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="27"/>
         <source>Start press.</source>
         <translation>Kezdő nyomás</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>End press.</source>
         <translation>Végső nyomás</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>O₂%</source>
         <translation>O₂%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Deco switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Bot. MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>MND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Use</source>
         <translation>Használ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="53"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="54"/>
         <source>cuft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="57"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="58"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="237"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="238"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="248"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="249"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="250"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="251"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max. depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="252"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max. depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="235"/>
+        <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 type="unfinished"/>
     </message>
@@ -2626,54 +2626,54 @@ Nyomd meg a mentés gombot.</translation>
 <context>
     <name>DiveComponentSelection</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="487"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
         <source>Dive site: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="489"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
         <source>Dive master: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="491"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
         <source>Buddy: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="493"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="494"/>
         <source>Rating: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="495"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="496"/>
         <source>Visibility: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="497"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="498"/>
         <source>Notes:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="499"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="500"/>
         <source>Suit: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="501"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="511"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="512"/>
         <source>Cylinders:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="519"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/>
         <source>Weights:
 </source>
         <translation type="unfinished"/>
@@ -3046,38 +3046,38 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="186"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="187"/>
         <source> (cyl. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="190"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
         <source>ICD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
         <source>ΔHe</source>
         <translation>ΔHe</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="193"/>
         <source>ΔN₂</source>
         <translation>ΔN₂</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="213"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="214"/>
         <source>Manual switch to OC</source>
         <translation>Kézi váltás OC-re</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="215"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>kezdés</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="217"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>befejezés</translation>
@@ -3086,27 +3086,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="37"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="38"/>
         <source>Date/time</source>
         <translation>Dátum/idő</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="39"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="40"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="41"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="42"/>
         <source>Depth</source>
         <translation>Mélység</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>h</source>
         <translation>ó</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>min</source>
         <translation>perc</translation>
     </message>
@@ -3171,117 +3171,117 @@ GPS location:</source>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="911"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="912"/>
         <source>Expand all</source>
         <translation>Mind kinyit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="913"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="914"/>
         <source>Collapse all</source>
         <translation>Összes összecsukása</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="918"/>
         <source>Collapse others</source>
         <translation>Továbbiak összecsukása</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="921"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
         <source>Remove dive(s) from trip</source>
         <translation>Merülés(ek) eltávolítása az túrából</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="923"/>
         <source>Create new trip above</source>
         <translation>Túra létrehozása fentebb</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="937"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="938"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Merülés(ek) hozzáadása a túrához azonnal fölé</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="939"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="940"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Merülés(ek) hozzáadása a túrához azonnal alá</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="943"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
         <source>Merge trip with trip above</source>
         <translation>Túra egyesítése a fentivel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="945"/>
         <source>Merge trip with trip below</source>
         <translation>Túra egyesítése a lentivel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="948"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="949"/>
         <source>Delete dive(s)</source>
         <translation>Merülés(ek) törlése</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="950"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="951"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="954"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="955"/>
         <source>Merge selected dives</source>
         <translation>Egysiteni a kiválasztott merüléseket</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="956"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
         <source>Renumber dive(s)</source>
         <translation>Újraszámozni a merülés(t/eket)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
         <source>Split selected dives</source>
         <translation>Felosztani a kiválasztott merüléseket</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
         <source>Load media from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="961"/>
         <source>Load media from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="986"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="987"/>
         <source>Open media files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="989"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
         <source>Media files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
         <source>Image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
         <source>Video files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="993"/>
         <source>All files</source>
         <translation>Összes fájl</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="1041"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="1042"/>
         <source>%1 does not appear to be an image</source>
         <translation type="unfinished"/>
     </message>
@@ -3547,7 +3547,7 @@ GPS location:</source>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="559"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="113"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="115"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="412"/>
         <source>Light</source>
         <translation>Fény</translation>
@@ -3559,157 +3559,157 @@ GPS location:</source>
         <translation>Homok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
         <source>Send the dive data to dive-share.appspot.com website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface nativ XML formátum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
         <source>Subsurface dive sites native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
         <source>Write dive as TeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
         <source>Write dive as LaTeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
         <source>Write the profile image as PNG file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="108"/>
         <source>Write profile data to a CSV file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
         <source>UDDF files</source>
         <translation>UDDF fájlok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/>
         <source>CSV files</source>
         <translation>CSV fájlok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="201"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="203"/>
         <source>HTML files</source>
         <translation>HTML fájlok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="165"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Subsurface files</source>
         <translation>Subsurface fájlok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="175"/>
         <source>Export Subsurface dive sites XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>TeX files</source>
         <translation>TeX fájlok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/>
         <source>Export world map</source>
         <translation>Világtérkép exportálása</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="164"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Export Subsurface XML</source>
         <translation>Subsurface XML exportálása</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="182"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>Export to TeX file</source>
         <translation>Exportálás TeX fájlba</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Save profile image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="196"/>
         <source>Save profile data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="200"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="202"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="214"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="216"/>
         <source>Please wait, exporting...</source>
         <translation>Kérlek várj, exportálás ...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="249"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="482"/>
+        <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>A %s fájlt nem lehet megnyitni</translation>
     </message>
@@ -4092,62 +4092,62 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="171"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="173"/>
         <source>unknown</source>
         <translation>ismeretlen</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="272"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="274"/>
         <source>cyl.</source>
         <translation>pal.</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="378"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
         <source>Final depth</source>
         <translation>Végső mélység</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="390"/>
         <source>Dive mode</source>
         <translation>Merülési mód</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1026"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1028"/>
         <source>min</source>
         <translation>perc</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1032"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1034"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1035"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1037"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1082"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1084"/>
         <source>Stop times</source>
         <translation type="unfinished"/>
     </message>
@@ -4357,12 +4357,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveSiteSortedModel</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="271"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="278"/>
         <source>Delete dive site?</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../qt-models/divelocationmodel.cpp" line="272"/>
+        <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 type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -4371,186 +4371,186 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModelBase</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="66"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="274"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="314"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="208"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="275"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="276"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="316"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="277"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="317"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="211"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="278"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="318"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="279"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
         <source>Rating</source>
         <translation>Értékelés</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="282"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="322"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="283"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="323"/>
         <source>Duration</source>
         <translation>Időtartam</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="217"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="324"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="325"/>
         <source>Temp.(°%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="288"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="328"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="222"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="289"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="329"/>
         <source>Suit</source>
         <translation>Ruha</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="223"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="290"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="330"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="291"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="331"/>
         <source>Cylinder</source>
         <translation>Palack</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="225"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="292"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="332"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="293"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="333"/>
         <source>Gas</source>
         <translation>Gáz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="231"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="296"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="338"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="297"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="234"/>
         <source>Max. CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="300"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="342"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="301"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="343"/>
         <source>Tags</source>
         <translation>Címkék</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="237"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="344"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="238"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="345"/>
         <source>Media before/during/after dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="304"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="240"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="305"/>
         <source>Country</source>
         <translation>Ország</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="241"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="306"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="346"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="242"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="307"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="347"/>
         <source>Buddy</source>
         <translation>Merülőtárs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="243"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="308"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="348"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="309"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="349"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="280"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="281"/>
         <source>Depth</source>
         <translation>Mélység</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="284"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
         <source>Temp.</source>
         <translation>Hőm.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="286"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="287"/>
         <source>Weight</source>
         <translation>Súly</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="294"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="295"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="298"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="340"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="299"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="341"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="302"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="303"/>
         <source>Media</source>
         <translation type="unfinished"/>
     </message>
@@ -4558,106 +4558,106 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="243"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="279"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="526"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="717"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="528"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="719"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="562"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="594"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="635"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="667"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="669"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="681"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="683"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="693"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="682"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="692"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="694"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="160"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="491"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="162"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="493"/>
         <source>No dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="170"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="172"/>
         <source>Stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="180"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="182"/>
         <source>Failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="718"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="720"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="731"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="734"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="737"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="739"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="740"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="742"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="751"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="753"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -4722,73 +4722,73 @@ Existing Site</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="86"/>
         <source>Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="90"/>
         <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="177"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="180"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="202"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="205"/>
         <source>Connecting to dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Garmin dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/>
         <source>Cancel download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="430"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="455"/>
         <source>Choose file for dive computer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="431"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
         <source>Log files</source>
         <translation>Napló fájlok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="481"/>
         <source>Choose file for dive computer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="457"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="482"/>
         <source>Dump files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="485"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="510"/>
         <source>Retry download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="444"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="469"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="445"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="470"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
@@ -4875,10 +4875,10 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="303"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="392"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="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="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="334"/>
         <source>Download</source>
         <translation type="unfinished"/>
@@ -4909,7 +4909,7 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="340"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
@@ -4925,72 +4925,72 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/>
         <source> Vendor name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="97"/>
         <source>USB device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="105"/>
         <source> Dive Computer:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="145"/>
         <source> Connection:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/>
         <source> Previously used dive computers: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <source>Quit</source>
         <translation>Kilépés</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="312"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="316"/>
         <source>Rescan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="321"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="325"/>
         <source> Downloaded dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="322"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="326"/>
         <source>Info:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="345"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="349"/>
         <source>force downloading all dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="383"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="387"/>
         <source>Accept</source>
         <translation>Elfogad</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="403"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="407"/>
         <source>Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="412"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="416"/>
         <source>Unselect All</source>
         <translation type="unfinished"/>
     </message>
@@ -4998,7 +4998,7 @@ Existing Site</source>
 <context>
     <name>DownloadThread</name>
     <message>
-        <location filename="../core/downloadfromdcthread.cpp" line="101"/>
+        <location filename="../core/downloadfromdcthread.cpp" line="102"/>
         <source>No new dives downloaded from dive computer</source>
         <translation type="unfinished"/>
     </message>
@@ -5006,7 +5006,7 @@ Existing Site</source>
 <context>
     <name>EditBuddies</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="602"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="638"/>
         <source>buddies</source>
         <translation type="unfinished"/>
     </message>
@@ -5014,7 +5014,7 @@ Existing Site</source>
 <context>
     <name>EditDiveMaster</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="625"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="661"/>
         <source>dive master</source>
         <translation type="unfinished"/>
     </message>
@@ -5022,15 +5022,23 @@ Existing Site</source>
 <context>
     <name>EditMode</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="440"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="454"/>
         <source>dive mode</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>EditNumber</name>
+    <message>
+        <location filename="../desktop-widgets/command_edit.cpp" line="475"/>
+        <source>number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditTags</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="570"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="606"/>
         <source>tags</source>
         <translation type="unfinished"/>
     </message>
@@ -5038,7 +5046,7 @@ Existing Site</source>
 <context>
     <name>EditTagsBase</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="511"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="547"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
@@ -5093,129 +5101,134 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="47"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="41"/>
         <source>Reset / close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="57"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="102"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="123"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="140"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="64"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="58"/>
         <source>People</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="71"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="95"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="147"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="189"/>
+        <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"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="78"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="72"/>
         <source>Rating</source>
         <translation>Értékelés</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="85"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="79"/>
         <source>Tags</source>
         <translation>Címkék</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="109"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="103"/>
         <source>From</source>
         <translation>Feladó</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="116"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="110"/>
         <source>To</source>
         <translation>Címzett</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="133"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="127"/>
         <source>Visibility</source>
         <translation>Láthatóság</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="163"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="157"/>
         <source>Equipment</source>
         <translation>Felszerelés</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="179"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="173"/>
         <source>Water Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="196"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="190"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="203"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="197"/>
         <source>Suit</source>
         <translation>Ruha</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="210"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="204"/>
         <source>Notes</source>
         <translation>Jegyzetek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="217"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="211"/>
         <source>Air Temp</source>
         <translation>Lég Hőm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="276"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="270"/>
         <source>Logged</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="286"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="280"/>
         <source>Planned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="330"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="310"/>
+        <source>Close filters</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="345"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="364"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="383"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="402"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="421"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="440"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="350"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="369"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="388"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="407"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="426"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="445"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="355"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="374"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="393"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="412"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="431"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="450"/>
+        <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 type="unfinished"/>
     </message>
@@ -5225,7 +5238,6 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="316"/>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="124"/>
         <source>Close and reset filters</source>
         <translation type="unfinished"/>
@@ -5308,12 +5320,12 @@ Existing Site</source>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2225"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2227"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2230"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2232"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -5329,7 +5341,7 @@ Existing Site</source>
 <context>
     <name>GasSelectionModel</name>
     <message>
-        <location filename="../qt-models/models.cpp" line="38"/>
+        <location filename="../qt-models/models.cpp" line="39"/>
         <source>cyl.</source>
         <translation>pal.</translation>
     </message>
@@ -5373,7 +5385,7 @@ Existing Site</source>
 <context>
     <name>GpsLocation</name>
     <message>
-        <location filename="../core/gpslocation.cpp" line="132"/>
+        <location filename="../core/gpslocation.cpp" line="134"/>
         <source>Unknown GPS location (no GPS source)</source>
         <translation type="unfinished"/>
     </message>
@@ -5587,9 +5599,9 @@ Existing Site</source>
     <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="30"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="504"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="450"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="511"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="512"/>
         <source>Notes</source>
@@ -5615,21 +5627,21 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="110"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="228"/>
+        <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>Levegő hőm.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="120"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="229"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="225"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="496"/>
         <source>Water temp.</source>
         <translation>Víz hőm.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="195"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="545"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="498"/>
         <source>Location</source>
         <translation>Hely</translation>
@@ -5672,25 +5684,24 @@ Existing Site</source>
         <translation>Láthatóság</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="343"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
         <source>Suit</source>
         <translation>Ruha</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="402"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="398"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="509"/>
         <source>Tags</source>
         <translation>Címkék</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="412"/>
+        <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>Merülési mód</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="62"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="513"/>
         <source>Equipment</source>
         <translation>Felszerelés</translation>
@@ -5708,93 +5719,93 @@ Existing Site</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="70"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/>
         <source>Extra Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="64"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="66"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="65"/>
         <source>Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="68"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="67"/>
         <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="71"/>
         <source>Dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="91"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="90"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="95"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="94"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="99"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="731"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="735"/>
         <source>Warning: edited %1 dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="225"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="221"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="226"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="222"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="264"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="260"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="266"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="262"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="494"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="458"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="489"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="491"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="686"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="690"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="687"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="691"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -5862,7 +5873,7 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="494"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="535"/>
         <source>Open</source>
         <translation type="unfinished"/>
@@ -6281,45 +6292,45 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="485"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="532"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1514"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="491"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="691"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="655"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
+        <location filename="../desktop-widgets/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"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="692"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="693"/>
         <source>Trying to merge dives with %1min interval in between</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="256"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
         <source>Template backup created</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="258"/>
         <source>The following backup printing templates were created:
 
 %1
@@ -6333,229 +6344,229 @@ can overwrite them on startup.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="607"/>
         <source>Please save or cancel the current dive edit before going online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="620"/>
         <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="629"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="630"/>
         <source>Failure taking cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="703"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="806"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="857"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="858"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="914"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1669"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1772"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>multiple files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1750"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1766"/>
         <source>Open dive site file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1016"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1017"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1284"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/>
         <source>Dive log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1263"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1543"/>
-        <source>Subsurface files</source>
-        <translation>Subsurface fájlok</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
-        <source>Cochran</source>
-        <translation type="unfinished"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1559"/>
+        <source>Subsurface files</source>
+        <translation>Subsurface fájlok</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
-        <source>DiveLogs.de</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+        <source>Cochran</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
-        <source>JDiveLog</source>
+        <source>DiveLogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
-        <source>Liquivision</source>
+        <source>JDiveLog</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
-        <source>Suunto</source>
+        <source>Liquivision</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
-        <source>UDCF</source>
+        <source>Suunto</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
+        <source>UDCF</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
-        <source>XML</source>
-        <translation type="unfinished"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
-        <source>Divesoft</source>
+        <source>XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
-        <source>Datatrak/WLog</source>
+        <source>Divesoft</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
-        <source>MkVI files</source>
+        <source>Datatrak/WLog</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
-        <source>APD log viewer</source>
+        <source>MkVI files</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1276"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
-        <source>OSTCtools</source>
+        <source>APD log viewer</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
+        <source>OSTCtools</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
         <source>DAN DL7</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
         <source>CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/>
         <source>All files</source>
         <translation>Összes fájl</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/>
         <source>Dive site files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="618"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1349"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1542"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1558"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1630"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1646"/>
         <source>[local cache for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1631"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1647"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1698"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1699"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1723"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1739"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
@@ -6675,7 +6686,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
 <context>
     <name>PasteDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="728"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="760"/>
         <source>Paste onto %n dive(s)</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
@@ -6908,22 +6919,32 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="14"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Subsurface files</source>
         <translation>Subsurface fájlok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
+        <source>Couldn&apos;t execute ffmpeg at given location. Thumbnailing will not work.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="70"/>
         <source>Select ffmpeg executable</source>
         <translation type="unfinished"/>
     </message>
@@ -7171,7 +7192,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="12"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
@@ -7807,17 +7828,17 @@ Please export this template to a different file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="840"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="837"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1451"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1435"/>
         <source>Make first dive computer</source>
         <translation type="unfinished"/>
     </message>
@@ -7832,103 +7853,103 @@ Please export this template to a different file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1440"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
         <source>Delete this dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1441"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Split this dive computer into own dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1457"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
         <source> (cyl. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1463"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
         <source>Add setpoint change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1465"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1462"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1467"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1464"/>
         <source>Split dive into two</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1477"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
         <source>Change divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1501"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1498"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1505"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1502"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1507"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1517"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1548"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1555"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1545"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1552"/>
         <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1570"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1567"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1630"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1631"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1786"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1783"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1787"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1784"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1792"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1789"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -7936,146 +7957,151 @@ Please export this template to a different file.</source>
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="206"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="207"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="275"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/>
         <source>Open local dive data file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="283"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Opening local data file failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/>
         <source>%1 dives loaded from local dive data file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="425"/>
         <source>Error parsing local storage, giving up</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="427"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="434"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="428"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="504"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="473"/>
         <source>Invalid format for email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="544"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="552"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="559"/>
         <source>No response from cloud server to validate the credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="567"/>
         <source>Incorrect cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="566"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="593"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="600"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="607"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="628"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="634"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="641"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="646"/>
         <source>Cloud credentials valid, loading dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="649"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="656"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="695"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="702"/>
         <source>Loading dives from local storage (&apos;no cloud&apos; mode)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="748"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="766"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
         <source>h</source>
         <translation>ó</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="942"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="953"/>
         <source>min</source>
         <translation>perc</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1479"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1048"/>
+        <source>weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1493"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -8091,15 +8117,15 @@ Please export this template to a different file.</source>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2151"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2153"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2148"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2131"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2139"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2150"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -8120,23 +8146,23 @@ Please export this template to a different file.</source>
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="138"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="139"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="90"/>
         <source>New starting number</source>
         <translation>Új kezdő szám</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="136"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="137"/>
         <source>New number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="141"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
         <source>Renumber selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="143"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="144"/>
         <source>Renumber all dives</source>
         <translation type="unfinished"/>
     </message>
@@ -8144,7 +8170,7 @@ Please export this template to a different file.</source>
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2248"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2250"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -8453,38 +8479,38 @@ Not all media files have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="284"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="285"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="286"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="287"/>
         <source>Image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="367"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="368"/>
         <source>Selected dive date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="369"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
         <source>First selected dive date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="371"/>
         <source>Last selected dive date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="372"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/>
         <source>
 Files with inappropriate date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="382"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="383"/>
         <source>No Exif date/time found</source>
         <translation type="unfinished"/>
     </message>
@@ -8586,28 +8612,28 @@ Files with inappropriate date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
         <source>Open SmartTrak files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
         <source>SmartTrak files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>All files</source>
         <translation>Összes fájl</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>Subsurface files</source>
         <translation>Subsurface fájlok</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
         <source>Open Subsurface files</source>
         <translation type="unfinished"/>
     </message>
@@ -8671,25 +8697,45 @@ Files with inappropriate date/time</source>
         <translation>Felszerelés</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="48"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.ui" line="74"/>
+        <source>Suit</source>
+        <translation>Ruha</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
         <source>Cylinders</source>
         <translation>Palackok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="49"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
         <source>Add cylinder</source>
         <translation>Palack hozzáadása</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="56"/>
         <source>Weights</source>
         <translation>Súlyok</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="60"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="64"/>
+        <source>Undo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="306"/>
+        <source>Warning: edited %1 dives</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>TabDiveExtraInfo</name>
@@ -8797,29 +8843,29 @@ Files with inappropriate date/time</source>
         <translation>Víz típusa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="75"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="76"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>h</source>
         <translation>ó</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>min</source>
         <translation>perc</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>d</source>
         <translation type="unfinished"/>
     </message>
@@ -9308,7 +9354,7 @@ mixed from Air and using:
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
@@ -9610,12 +9656,12 @@ Language: %1</source>
     <name>VideoFrameExtractor</name>
     <message>
         <location filename="../core/videoframeextractor.cpp" line="93"/>
-        <source>ffmpeg failed to start - video thumbnail creation suspended</source>
+        <source>ffmpeg failed to start - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/videoframeextractor.cpp" line="99"/>
-        <source>failed waiting for ffmpeg - video thumbnail creation suspended</source>
+        <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"/>
     </message>
 </context>
@@ -9683,12 +9729,12 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="331"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="352"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -9706,7 +9752,7 @@ Language: %1</source>
         <translation>Súly</translation>
     </message>
     <message>
-        <location filename="../qt-models/weightmodel.cpp" line="72"/>
+        <location filename="../qt-models/weightmodel.cpp" line="71"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
@@ -9714,15 +9760,15 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2198"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2200"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2195"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2179"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2189"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2197"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -9832,7 +9878,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="801"/>
+        <location filename="../core/libdivecomputer.c" line="802"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -9843,7 +9889,7 @@ Maximum</source>
         <location filename="../core/cochran.c" line="306"/>
         <location filename="../core/cochran.c" line="312"/>
         <location filename="../core/cochran.c" line="382"/>
-        <location filename="../core/libdivecomputer.c" line="244"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deco stop</source>
         <translation type="unfinished"/>
     </message>
@@ -9851,7 +9897,7 @@ Maximum</source>
         <location filename="../core/cochran.c" line="333"/>
         <location filename="../core/cochran.c" line="387"/>
         <location filename="../core/import-csv.c" line="680"/>
-        <location filename="../core/libdivecomputer.c" line="246"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>ascent</source>
         <translation type="unfinished"/>
     </message>
@@ -9863,20 +9909,20 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/cochran.c" line="345"/>
-        <location filename="../core/libdivecomputer.c" line="262"/>
+        <location filename="../core/libdivecomputer.c" line="263"/>
         <source>OLF</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/cochran.c" line="350"/>
-        <location filename="../core/libdivecomputer.c" line="261"/>
+        <location filename="../core/libdivecomputer.c" line="262"/>
         <source>maxdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/cochran.c" line="355"/>
         <location filename="../core/cochran.c" line="401"/>
-        <location filename="../core/libdivecomputer.c" line="263"/>
+        <location filename="../core/libdivecomputer.c" line="264"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
@@ -9885,8 +9931,8 @@ Maximum</source>
         <location filename="../core/cochran.c" line="411"/>
         <location filename="../core/cochran.c" line="418"/>
         <location filename="../core/import-csv.c" line="761"/>
-        <location filename="../core/libdivecomputer.c" line="254"/>
-        <location filename="../core/libdivecomputer.c" line="268"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="269"/>
         <location filename="../core/plannernotes.c" line="54"/>
         <source>gaschange</source>
         <translation type="unfinished"/>
@@ -9894,101 +9940,101 @@ Maximum</source>
     <message>
         <location filename="../core/cochran.c" line="367"/>
         <location filename="../core/cochran.c" line="406"/>
-        <location filename="../core/libdivecomputer.c" line="245"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>rbt</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/cochran.c" line="376"/>
         <location filename="../core/cochran.c" line="423"/>
-        <location filename="../core/libdivecomputer.c" line="247"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../core/cochran.c" line="392"/>
-        <location filename="../core/libdivecomputer.c" line="249"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>transmitter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="255"/>
+        <location filename="../core/datatrak.c" line="256"/>
         <source>clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="258"/>
+        <location filename="../core/datatrak.c" line="259"/>
         <source>misty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="261"/>
+        <location filename="../core/datatrak.c" line="262"/>
         <source>fog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="264"/>
+        <location filename="../core/datatrak.c" line="265"/>
         <source>rain</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="267"/>
+        <location filename="../core/datatrak.c" line="268"/>
         <source>storm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="270"/>
+        <location filename="../core/datatrak.c" line="271"/>
         <source>snow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="290"/>
+        <location filename="../core/datatrak.c" line="291"/>
         <source>No suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="293"/>
+        <location filename="../core/datatrak.c" line="294"/>
         <source>Shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="296"/>
+        <location filename="../core/datatrak.c" line="297"/>
         <source>Combi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="299"/>
+        <location filename="../core/datatrak.c" line="300"/>
         <source>Wet suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="302"/>
+        <location filename="../core/datatrak.c" line="303"/>
         <source>Semidry suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="305"/>
+        <location filename="../core/datatrak.c" line="306"/>
         <source>Dry suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="364"/>
+        <location filename="../core/datatrak.c" line="365"/>
         <source>no stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="366"/>
+        <location filename="../core/datatrak.c" line="367"/>
         <location filename="../core/tag.c" line="20"/>
         <source>deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="368"/>
+        <location filename="../core/datatrak.c" line="369"/>
         <source>single ascent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="370"/>
+        <location filename="../core/datatrak.c" line="371"/>
         <source>multiple ascent</source>
         <translation type="unfinished"/>
     </message>
@@ -9998,116 +10044,116 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="372"/>
+        <location filename="../core/datatrak.c" line="373"/>
         <source>fresh water</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="374"/>
+        <location filename="../core/datatrak.c" line="375"/>
         <source>salt water</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="395"/>
+        <location filename="../core/datatrak.c" line="396"/>
         <source>sight seeing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="397"/>
+        <location filename="../core/datatrak.c" line="398"/>
         <source>club dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="399"/>
+        <location filename="../core/datatrak.c" line="400"/>
         <location filename="../core/tag.c" line="19"/>
         <source>instructor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="401"/>
+        <location filename="../core/datatrak.c" line="402"/>
         <source>instruction</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="403"/>
+        <location filename="../core/datatrak.c" line="404"/>
         <location filename="../core/tag.c" line="18"/>
         <source>night</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="405"/>
+        <location filename="../core/datatrak.c" line="406"/>
         <location filename="../core/tag.c" line="16"/>
         <source>cave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="407"/>
+        <location filename="../core/datatrak.c" line="408"/>
         <location filename="../core/tag.c" line="15"/>
         <source>ice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="409"/>
+        <location filename="../core/datatrak.c" line="410"/>
         <source>search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="416"/>
+        <location filename="../core/datatrak.c" line="417"/>
         <location filename="../core/tag.c" line="16"/>
         <source>wreck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="418"/>
+        <location filename="../core/datatrak.c" line="419"/>
         <location filename="../core/tag.c" line="17"/>
         <source>river</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="420"/>
+        <location filename="../core/datatrak.c" line="421"/>
         <location filename="../core/tag.c" line="14"/>
         <source>drift</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="422"/>
+        <location filename="../core/datatrak.c" line="423"/>
         <location filename="../core/tag.c" line="19"/>
         <source>photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="424"/>
+        <location filename="../core/datatrak.c" line="425"/>
         <source>other</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="434"/>
+        <location filename="../core/datatrak.c" line="435"/>
         <source>Other activities</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="458"/>
+        <location filename="../core/datatrak.c" line="459"/>
         <source>Datatrak/Wlog notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="502"/>
+        <location filename="../core/datatrak.c" line="503"/>
         <source>[Warning] Manual dive # %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="528"/>
+        <location filename="../core/datatrak.c" line="529"/>
         <source>[Error] Out of memory for dive %d. Abort parsing.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="576"/>
+        <location filename="../core/datatrak.c" line="577"/>
         <source>[Error] File is not a DataTrak file. Aborted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="589"/>
+        <location filename="../core/datatrak.c" line="590"/>
         <source>Error: no dive</source>
         <translation type="unfinished"/>
     </message>
@@ -10157,30 +10203,30 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>OC-gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>diluent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../core/equipment.c" line="92"/>
-        <location filename="../core/planner.c" line="1158"/>
-        <location filename="../core/planner.c" line="1161"/>
+        <location filename="../core/equipment.c" line="45"/>
+        <location filename="../core/equipment.c" line="144"/>
+        <location filename="../core/planner.c" line="1179"/>
+        <location filename="../core/planner.c" line="1182"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>not used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="32"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
@@ -10193,17 +10239,17 @@ Maximum</source>
         <location filename="../core/plannernotes.c" line="72"/>
         <location filename="../core/plannernotes.c" line="73"/>
         <location filename="../core/plannernotes.c" line="74"/>
-        <location filename="../core/qthelper.cpp" line="622"/>
-        <location filename="../core/qthelper.cpp" line="814"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
+        <location filename="../core/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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="625"/>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1251"/>
+        <location filename="../core/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 type="unfinished"/>
@@ -10214,25 +10260,25 @@ Maximum</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1275"/>
+        <location filename="../core/qthelper.cpp" line="1277"/>
         <location filename="../core/units.c" line="65"/>
         <source>cuft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="538"/>
-        <location filename="../core/qthelper.cpp" line="553"/>
-        <location filename="../core/qthelper.cpp" line="732"/>
-        <location filename="../core/qthelper.cpp" line="1227"/>
+        <location filename="../core/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="541"/>
-        <location filename="../core/qthelper.cpp" line="555"/>
-        <location filename="../core/qthelper.cpp" line="734"/>
-        <location filename="../core/qthelper.cpp" line="1226"/>
+        <location filename="../core/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 type="unfinished"/>
@@ -10258,86 +10304,86 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="564"/>
-        <location filename="../core/qthelper.cpp" line="574"/>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <location filename="../core/qthelper.cpp" line="1203"/>
+        <location filename="../core/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="132"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="133"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="562"/>
-        <location filename="../core/qthelper.cpp" line="572"/>
-        <location filename="../core/qthelper.cpp" line="787"/>
-        <location filename="../core/qthelper.cpp" line="1202"/>
+        <location filename="../core/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="130"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="131"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="678"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1154"/>
-        <location filename="../core/planner.c" line="1157"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="90"/>
+        <location filename="../core/equipment.c" line="142"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="205"/>
+        <location filename="../core/equipment.c" line="252"/>
         <source>integrated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="206"/>
+        <location filename="../core/equipment.c" line="253"/>
         <source>belt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="207"/>
+        <location filename="../core/equipment.c" line="254"/>
         <source>ankle</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="208"/>
+        <location filename="../core/equipment.c" line="255"/>
         <source>backplate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="209"/>
+        <location filename="../core/equipment.c" line="256"/>
         <source>clip-on</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="116"/>
+        <location filename="../core/file.c" line="117"/>
         <source>No dives in the input file &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="334"/>
+        <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="53"/>
+        <location filename="../core/ostctools.c" line="54"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>&apos;%s&apos; olvasása meghiúsult.</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="221"/>
+        <location filename="../core/file.c" line="222"/>
         <source>Cannot open CSV file %s; please use Import log file dialog</source>
         <comment>'Import log file' should be the same text as corresponding label in Import menu</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="336"/>
+        <location filename="../core/file.c" line="337"/>
         <source>Empty file &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
@@ -10388,287 +10434,287 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="83"/>
+        <location filename="../core/git-access.c" line="85"/>
         <source>Checkout from storage (%lu/%lu)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="114"/>
+        <location filename="../core/git-access.c" line="116"/>
         <source>Transfer from storage (%d/%d)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="126"/>
+        <location filename="../core/git-access.c" line="128"/>
         <source>Transfer to storage (%d/%d)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="162"/>
+        <location filename="../core/git-access.c" line="164"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="185"/>
-        <location filename="../core/git-access.c" line="205"/>
+        <location filename="../core/git-access.c" line="187"/>
+        <location filename="../core/git-access.c" line="207"/>
         <source>Could not update local cache to newer remote data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="198"/>
+        <location filename="../core/git-access.c" line="200"/>
         <source>Subsurface cloud storage corrupted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="334"/>
+        <location filename="../core/git-access.c" line="336"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="394"/>
+        <location filename="../core/git-access.c" line="396"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="424"/>
+        <location filename="../core/git-access.c" line="426"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="458"/>
+        <location filename="../core/git-access.c" line="460"/>
         <source>Remote storage and local data diverged</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="461"/>
+        <location filename="../core/git-access.c" line="463"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="470"/>
+        <location filename="../core/git-access.c" line="472"/>
         <source>Problems with local cache of Subsurface cloud data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="471"/>
+        <location filename="../core/git-access.c" line="473"/>
         <source>Moved cache data to %s. Please try the operation again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="518"/>
+        <location filename="../core/git-access.c" line="520"/>
         <source>Update local storage to match cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="526"/>
+        <location filename="../core/git-access.c" line="528"/>
         <source>Push local changes to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="544"/>
+        <location filename="../core/git-access.c" line="546"/>
         <source>Try to merge local changes into cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="586"/>
+        <location filename="../core/git-access.c" line="588"/>
         <source>Store data into cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="610"/>
+        <location filename="../core/git-access.c" line="612"/>
         <source>Sync with cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="637"/>
+        <location filename="../core/git-access.c" line="639"/>
         <source>Can&apos;t reach cloud server, working with local data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="650"/>
+        <location filename="../core/git-access.c" line="652"/>
         <source>Successful cloud connection, fetch remote</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="669"/>
+        <location filename="../core/git-access.c" line="671"/>
         <source>Done syncing with cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="804"/>
+        <location filename="../core/git-access.c" line="806"/>
         <source>Error connecting to Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="807"/>
+        <location filename="../core/git-access.c" line="809"/>
         <source>git clone of %s failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="833"/>
+        <location filename="../core/git-access.c" line="835"/>
         <source>Synchronising data file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/import-divinglog.c" line="315"/>
-        <location filename="../core/libdivecomputer.c" line="230"/>
+        <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/uemis-downloader.c" line="197"/>
+        <location filename="../core/uemis-downloader.c" line="199"/>
         <source>unknown</source>
         <translation>ismeretlen</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="243"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>none</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="248"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>workload</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="250"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>violation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="251"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="252"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="253"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="256"/>
+        <location filename="../core/libdivecomputer.c" line="257"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="257"/>
+        <location filename="../core/libdivecomputer.c" line="258"/>
         <source>deepstop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="258"/>
+        <location filename="../core/libdivecomputer.c" line="259"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="259"/>
+        <location filename="../core/libdivecomputer.c" line="260"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="260"/>
+        <location filename="../core/libdivecomputer.c" line="261"/>
         <source>divetime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="264"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>airtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="265"/>
+        <location filename="../core/libdivecomputer.c" line="266"/>
         <source>rgbm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="266"/>
+        <location filename="../core/libdivecomputer.c" line="267"/>
         <source>heading</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="267"/>
+        <location filename="../core/libdivecomputer.c" line="268"/>
         <source>tissue level warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="277"/>
+        <location filename="../core/libdivecomputer.c" line="278"/>
         <source>invalid event number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="613"/>
+        <location filename="../core/libdivecomputer.c" line="614"/>
         <source>Error parsing the datetime</source>
         <translation>Hiba a dátumidő feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="631"/>
+        <location filename="../core/libdivecomputer.c" line="632"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="637"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error parsing the divetime</source>
         <translation>Hiba a merülési idő feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
+        <location filename="../core/libdivecomputer.c" line="648"/>
         <source>Error parsing the maxdepth</source>
         <translation>Hiba a max mélység feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="661"/>
+        <location filename="../core/libdivecomputer.c" line="662"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="680"/>
+        <location filename="../core/libdivecomputer.c" line="681"/>
         <source>Error parsing the gas mix count</source>
         <translation>Hiba gáz keverék számítás feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="691"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error obtaining water salinity</source>
         <translation>Hiba a víz sótartalmának lekérdezésekor</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="700"/>
+        <location filename="../core/libdivecomputer.c" line="701"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
+        <location filename="../core/libdivecomputer.c" line="724"/>
         <source>Error obtaining dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="745"/>
+        <location filename="../core/libdivecomputer.c" line="746"/>
         <source>Error parsing the gas mix</source>
         <translation>Hiba a gáz keverék feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="771"/>
+        <location filename="../core/libdivecomputer.c" line="772"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="778"/>
         <source>Error registering the data</source>
         <translation>Hiba az adat regisztrálása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="808"/>
+        <location filename="../core/libdivecomputer.c" line="809"/>
         <source>Error parsing the samples</source>
         <translation>Hiba a minták feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="815"/>
+        <location filename="../core/libdivecomputer.c" line="816"/>
         <source>Already downloaded dive at %s</source>
         <translation type="unfinished"/>
     </message>
@@ -10726,53 +10772,53 @@ You can create this logfile by selecting the corresponding checkbox in the downl
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="175"/>
-        <location filename="../core/parse-xml.c" line="1207"/>
+        <location filename="../core/load-git.c" line="186"/>
+        <location filename="../core/parse-xml.c" line="1208"/>
         <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="201"/>
-        <location filename="../core/parse.c" line="442"/>
+        <location filename="../core/load-git.c" line="211"/>
+        <location filename="../core/parse.c" line="443"/>
         <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1664"/>
+        <location filename="../core/load-git.c" line="1659"/>
         <source>Load dives from local cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1668"/>
+        <location filename="../core/load-git.c" line="1663"/>
         <source>Successfully opened dive data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="128"/>
-        <location filename="../core/ostctools.c" line="159"/>
+        <location filename="../core/ostctools.c" line="129"/>
+        <location filename="../core/ostctools.c" line="160"/>
         <source>Unknown DC in dive %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="171"/>
+        <location filename="../core/ostctools.c" line="172"/>
         <source>Error - %s - parsing dive %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="400"/>
+        <location filename="../core/parse-xml.c" line="401"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="1664"/>
+        <location filename="../core/parse-xml.c" line="1663"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>&apos;%s&apos; értelmezése meghiúsult.</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2257"/>
+        <location filename="../core/parse-xml.c" line="2256"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -10799,7 +10845,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl
     </message>
     <message>
         <location filename="../core/planner.c" line="300"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="193"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="194"/>
         <source>SP change</source>
         <translation type="unfinished"/>
     </message>
@@ -11066,460 +11112,460 @@ You can create this logfile by selecting the corresponding checkbox in the downl
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="881"/>
+        <location filename="../core/planner.c" line="900"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1162"/>
+        <location filename="../core/planner.c" line="1183"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1406"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1407"/>
+        <location filename="../core/profile.c" line="1417"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1413"/>
+        <location filename="../core/profile.c" line="1423"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1416"/>
+        <location filename="../core/profile.c" line="1426"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1418"/>
+        <location filename="../core/profile.c" line="1428"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1427"/>
+        <location filename="../core/profile.c" line="1437"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1430"/>
+        <location filename="../core/profile.c" line="1440"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1470"/>
+        <location filename="../core/profile.c" line="1480"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1462"/>
+        <location filename="../core/profile.c" line="1472"/>
         <source>Safety stop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1403"/>
+        <location filename="../core/profile.c" line="1413"/>
         <source>P: %d%s (%s)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1420"/>
+        <location filename="../core/profile.c" line="1430"/>
         <source>pO₂: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1422"/>
+        <location filename="../core/profile.c" line="1432"/>
         <source>SCR ΔpO₂: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1425"/>
+        <location filename="../core/profile.c" line="1435"/>
         <source>pN₂: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1439"/>
+        <location filename="../core/profile.c" line="1449"/>
         <source>EAD: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1445"/>
+        <location filename="../core/profile.c" line="1455"/>
         <source>END: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1450"/>
+        <location filename="../core/profile.c" line="1460"/>
         <source>Density: %.1fg/ℓ
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1465"/>
+        <location filename="../core/profile.c" line="1475"/>
         <source>Safety stop: unknown time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1473"/>
+        <location filename="../core/profile.c" line="1483"/>
         <source>Deco: unknown time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1477"/>
+        <location filename="../core/profile.c" line="1487"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1479"/>
+        <location filename="../core/profile.c" line="1489"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1482"/>
+        <location filename="../core/profile.c" line="1492"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1485"/>
+        <location filename="../core/profile.c" line="1495"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1493"/>
+        <location filename="../core/profile.c" line="1503"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1496"/>
+        <location filename="../core/profile.c" line="1506"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1498"/>
+        <location filename="../core/profile.c" line="1508"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1502"/>
+        <location filename="../core/profile.c" line="1512"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1504"/>
+        <location filename="../core/profile.c" line="1514"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1517"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1510"/>
+        <location filename="../core/profile.c" line="1520"/>
         <source>Surface GF %.0f%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1513"/>
+        <location filename="../core/profile.c" line="1523"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1529"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1536"/>
         <source>ICD in leading tissue
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1528"/>
+        <location filename="../core/profile.c" line="1538"/>
         <source>heart rate: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1530"/>
+        <location filename="../core/profile.c" line="1540"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1533"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1630"/>
+        <location filename="../core/profile.c" line="1640"/>
         <source>ΔT:%d:%02dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1634"/>
+        <location filename="../core/profile.c" line="1644"/>
         <source>%s ΔD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1638"/>
+        <location filename="../core/profile.c" line="1648"/>
         <source>%s ↓D:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1642"/>
+        <location filename="../core/profile.c" line="1652"/>
         <source>%s ↑D:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1646"/>
+        <location filename="../core/profile.c" line="1656"/>
         <source>%s øD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1650"/>
+        <location filename="../core/profile.c" line="1660"/>
         <source>%s ↓V:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1654"/>
+        <location filename="../core/profile.c" line="1664"/>
         <source>%s ↑V:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1658"/>
+        <location filename="../core/profile.c" line="1668"/>
         <source>%s øV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1665"/>
+        <location filename="../core/profile.c" line="1675"/>
         <source>%s ΔP:%d%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1690"/>
+        <location filename="../core/profile.c" line="1700"/>
         <source>%s SAC:%.*f%s/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="68"/>
+        <location filename="../core/qthelper.cpp" line="70"/>
         <source>%1km</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="70"/>
+        <location filename="../core/qthelper.cpp" line="72"/>
         <source>%1m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="74"/>
+        <location filename="../core/qthelper.cpp" line="76"/>
         <source>%1mi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="76"/>
+        <location filename="../core/qthelper.cpp" line="78"/>
         <source>%1yd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="234"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="236"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="235"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="237"/>
         <source>S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="236"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="238"/>
         <source>E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="237"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="239"/>
         <source>W</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="583"/>
-        <location filename="../core/qthelper.cpp" line="760"/>
+        <location filename="../core/qthelper.cpp" line="585"/>
+        <location filename="../core/qthelper.cpp" line="762"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="586"/>
-        <location filename="../core/qthelper.cpp" line="762"/>
+        <location filename="../core/qthelper.cpp" line="588"/>
+        <location filename="../core/qthelper.cpp" line="764"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="837"/>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>AIR</source>
         <translation>LÉG</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="841"/>
         <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="914"/>
+        <location filename="../core/qthelper.cpp" line="916"/>
         <source>more than %1 days</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="960"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1274"/>
+        <location filename="../core/qthelper.cpp" line="1276"/>
         <source>l</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="480"/>
-        <location filename="../core/save-html.c" line="564"/>
-        <location filename="../core/worldmap-save.c" line="114"/>
+        <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>A %s fájlt nem lehet megnyitni</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="499"/>
+        <location filename="../core/save-html.c" line="501"/>
         <source>Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="500"/>
+        <location filename="../core/save-html.c" line="502"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="501"/>
+        <location filename="../core/save-html.c" line="503"/>
         <source>Time</source>
         <translation>Idő</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="502"/>
+        <location filename="../core/save-html.c" line="504"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="503"/>
+        <location filename="../core/save-html.c" line="505"/>
         <source>Air temp.</source>
         <translation>Levegő hőm.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="504"/>
+        <location filename="../core/save-html.c" line="506"/>
         <source>Water temp.</source>
         <translation>Víz hőm.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="507"/>
         <source>Dives</source>
         <translation>Merülések</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="506"/>
+        <location filename="../core/save-html.c" line="508"/>
         <source>Expand all</source>
         <translation>Mind kinyit</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="507"/>
+        <location filename="../core/save-html.c" line="509"/>
         <source>Collapse all</source>
         <translation>Összes összecsukása</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="508"/>
+        <location filename="../core/save-html.c" line="510"/>
         <source>Trips</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../core/save-html.c" line="511"/>
         <source>Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="510"/>
+        <location filename="../core/save-html.c" line="512"/>
         <source>Advanced search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="513"/>
+        <location filename="../core/save-html.c" line="515"/>
         <source>Rating</source>
         <translation>Értékelés</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="514"/>
+        <location filename="../core/save-html.c" line="516"/>
         <source>Visibility</source>
         <translation>Láthatóság</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="515"/>
+        <location filename="../core/save-html.c" line="517"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="516"/>
+        <location filename="../core/save-html.c" line="518"/>
         <source>Divemaster</source>
         <translation>Merülés vezető</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="517"/>
+        <location filename="../core/save-html.c" line="519"/>
         <source>Buddy</source>
         <translation>Társ</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="518"/>
+        <location filename="../core/save-html.c" line="520"/>
         <source>Suit</source>
         <translation>Ruha</translation>
     </message>
@@ -11530,180 +11576,180 @@ EADD: %d%s / %.1fg/ℓ
     </message>
     <message>
         <location filename="../core/divesite-helper.cpp" line="29"/>
-        <location filename="../core/save-html.c" line="519"/>
+        <location filename="../core/save-html.c" line="521"/>
         <source>Tags</source>
         <translation>Címkék</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="520"/>
+        <location filename="../core/save-html.c" line="522"/>
         <location filename="../smtk-import/smartrak.c" line="257"/>
         <location filename="../smtk-import/smartrak.c" line="330"/>
         <source>Notes</source>
         <translation>Jegyzetek</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="521"/>
+        <location filename="../core/save-html.c" line="523"/>
         <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="524"/>
+        <location filename="../core/save-html.c" line="526"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="525"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Year</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="526"/>
+        <location filename="../core/save-html.c" line="528"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="527"/>
+        <location filename="../core/save-html.c" line="529"/>
         <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="528"/>
+        <location filename="../core/save-html.c" line="530"/>
         <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="529"/>
+        <location filename="../core/save-html.c" line="531"/>
         <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="530"/>
+        <location filename="../core/save-html.c" line="532"/>
         <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="531"/>
+        <location filename="../core/save-html.c" line="533"/>
         <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="532"/>
+        <location filename="../core/save-html.c" line="534"/>
         <source>Max. depth</source>
         <translation>Max. mélység</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="533"/>
+        <location filename="../core/save-html.c" line="535"/>
         <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="534"/>
+        <location filename="../core/save-html.c" line="536"/>
         <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="537"/>
         <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="536"/>
+        <location filename="../core/save-html.c" line="538"/>
         <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="537"/>
+        <location filename="../core/save-html.c" line="539"/>
         <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="538"/>
+        <location filename="../core/save-html.c" line="540"/>
         <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="539"/>
+        <location filename="../core/save-html.c" line="541"/>
         <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="542"/>
+        <location filename="../core/save-html.c" line="544"/>
         <source>Dive #</source>
         <translation>Merülés #</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="543"/>
+        <location filename="../core/save-html.c" line="545"/>
         <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="544"/>
+        <location filename="../core/save-html.c" line="546"/>
         <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="545"/>
+        <location filename="../core/save-html.c" line="547"/>
         <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="555"/>
         <source>Type</source>
         <translation>Típus</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="547"/>
+        <location filename="../core/save-html.c" line="549"/>
         <source>Size</source>
         <translation>Méret</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="550"/>
         <source>Work pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="549"/>
+        <location filename="../core/save-html.c" line="551"/>
         <source>Start pressure</source>
         <translation>Kezdő nyomás</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="550"/>
+        <location filename="../core/save-html.c" line="552"/>
         <source>End pressure</source>
         <translation>Végső nyomás</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="551"/>
+        <location filename="../core/save-html.c" line="553"/>
         <source>Gas</source>
         <translation>Gáz</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="552"/>
+        <location filename="../core/save-html.c" line="554"/>
         <source>Weight</source>
         <translation>Súly</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="554"/>
+        <location filename="../core/save-html.c" line="556"/>
         <source>Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="555"/>
+        <location filename="../core/save-html.c" line="557"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="556"/>
+        <location filename="../core/save-html.c" line="558"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="557"/>
+        <location filename="../core/save-html.c" line="559"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="558"/>
+        <location filename="../core/save-html.c" line="560"/>
         <source>Dive status</source>
         <translation type="unfinished"/>
     </message>
@@ -11723,17 +11769,17 @@ EADD: %d%s / %.1fg/ℓ
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/dive.c" line="29"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="34"/>
+        <location filename="../core/dive.c" line="30"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="35"/>
+        <location filename="../core/dive.c" line="31"/>
         <source>Freedive</source>
         <translation type="unfinished"/>
     </message>
@@ -11743,177 +11789,177 @@ EADD: %d%s / %.1fg/ℓ
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Mar</source>
         <translation>Már</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Apr</source>
         <translation>Ápr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>May</source>
         <translation>Máj</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jun</source>
         <translation>Jún</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Jul</source>
         <translation>Júl</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Sep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Oct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Nov</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="32"/>
+        <location filename="../core/uemis-downloader.c" line="34"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="33"/>
+        <location filename="../core/uemis-downloader.c" line="35"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="34"/>
+        <location filename="../core/uemis-downloader.c" line="36"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="35"/>
+        <location filename="../core/uemis-downloader.c" line="37"/>
         <source>No dives to download.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="499"/>
+        <location filename="../core/uemis-downloader.c" line="501"/>
         <source>%s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="535"/>
+        <location filename="../core/uemis-downloader.c" line="537"/>
         <source>data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="563"/>
+        <location filename="../core/uemis-downloader.c" line="565"/>
         <source>dive log #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="565"/>
+        <location filename="../core/uemis-downloader.c" line="567"/>
         <source>dive spot #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="567"/>
+        <location filename="../core/uemis-downloader.c" line="569"/>
         <source>details for #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>wetsuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>semidry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>drysuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>vest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>long john</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>jacket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>2 pcs full suit</source>
         <translation>2 db teljes öltözet</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>membrane</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1336"/>
+        <location filename="../core/uemis-downloader.c" line="1338"/>
         <source>Initialise communication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1339"/>
+        <location filename="../core/uemis-downloader.c" line="1341"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1351"/>
+        <location filename="../core/uemis-downloader.c" line="1353"/>
         <source>Start download</source>
         <translation type="unfinished"/>
     </message>
@@ -12008,76 +12054,76 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="42"/>
+        <location filename="../core/worldmap-save.c" line="44"/>
         <source>Date:</source>
         <translation>Dátum:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="44"/>
+        <location filename="../core/worldmap-save.c" line="46"/>
         <source>Time:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="46"/>
+        <location filename="../core/worldmap-save.c" line="48"/>
         <source>Duration:</source>
         <translation>Időtartam:</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
+        <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="140"/>
-        <location filename="../core/worldmap-save.c" line="47"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
+        <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>perc</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="140"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="100"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
+        <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>ó</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/qthelper.h" line="76"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="152"/>
+        <location filename="../core/divelogexportlogic.cpp" line="153"/>
         <source>Cannot find a folder called &apos;theme&apos; in the standard locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="50"/>
+        <location filename="../core/worldmap-save.c" line="52"/>
         <source>Max. depth:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="53"/>
+        <location filename="../core/worldmap-save.c" line="55"/>
         <source>Air temp.:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="56"/>
+        <location filename="../core/worldmap-save.c" line="58"/>
         <source>Water temp.:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="58"/>
+        <location filename="../core/worldmap-save.c" line="60"/>
         <source>Location:</source>
         <translation>Elhelyezkedés:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="62"/>
+        <location filename="../core/worldmap-save.c" line="64"/>
         <source>Notes:</source>
         <translation>Jegyzetek:</translation>
     </message>
@@ -12197,27 +12243,27 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="914"/>
+        <location filename="../core/save-git.c" line="916"/>
         <source>Start saving data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="923"/>
+        <location filename="../core/save-git.c" line="925"/>
         <source>Start saving dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="956"/>
+        <location filename="../core/save-git.c" line="958"/>
         <source>Done creating local cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="1207"/>
+        <location filename="../core/save-git.c" line="1209"/>
         <source>Preparing to save data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1661"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1658"/>
         <source>modechange</source>
         <translation type="unfinished"/>
     </message>
@@ -12232,57 +12278,57 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="558"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="559"/>
         <source>Don&apos;t save an empty log to the cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="46"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/>
         <source>Average</source>
         <translation>Átlag</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="49"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="52"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="406"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="414"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="460"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="467"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="121"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="122"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="743"/>
+        <location filename="../core/save-xml.c" line="749"/>
         <source>Failed to save dives to %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="864"/>
+        <location filename="../core/save-xml.c" line="871"/>
         <source>Failed to save divesites to %s (%s)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts
index ac5130220..13ed3dfbd 100644
--- a/translations/subsurface_id.ts
+++ b/translations/subsurface_id.ts
@@ -402,7 +402,7 @@
 <context>
     <name>CloudStorageAuthenticate</name>
     <message>
-        <location filename="../core/cloudstorage.cpp" line="65"/>
+        <location filename="../core/cloudstorage.cpp" line="66"/>
         <source>Cloud account verification required, enter PIN in preferences</source>
         <translation type="unfinished"/>
     </message>
@@ -608,7 +608,7 @@
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="78"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="92"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation type="unfinished"><numerusform></numerusform></translation>
@@ -681,7 +681,7 @@
 <context>
     <name>Command::EditAirTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="227"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="241"/>
         <source>air temperature</source>
         <translation type="unfinished"/>
     </message>
@@ -689,7 +689,7 @@
 <context>
     <name>Command::EditAtmPress</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="272"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="286"/>
         <source>Atm. pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -697,7 +697,7 @@
 <context>
     <name>Command::EditDepth</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="320"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="334"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
@@ -705,7 +705,7 @@
 <context>
     <name>Command::EditDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="342"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="356"/>
         <source>dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -761,7 +761,7 @@
 <context>
     <name>Command::EditDuration</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="296"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="310"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
@@ -769,7 +769,7 @@
 <context>
     <name>Command::EditNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="142"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="156"/>
         <source>notes</source>
         <translation type="unfinished"/>
     </message>
@@ -777,7 +777,7 @@
 <context>
     <name>Command::EditRating</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="185"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="199"/>
         <source>rating</source>
         <translation type="unfinished"/>
     </message>
@@ -785,7 +785,7 @@
 <context>
     <name>Command::EditSuit</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="164"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="178"/>
         <source>suit</source>
         <translation type="unfinished"/>
     </message>
@@ -817,7 +817,7 @@
 <context>
     <name>Command::EditVisibility</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="206"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="220"/>
         <source>visibility</source>
         <translation type="unfinished"/>
     </message>
@@ -825,7 +825,7 @@
 <context>
     <name>Command::EditWaterTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="251"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="265"/>
         <source>water temperature</source>
         <translation type="unfinished"/>
     </message>
@@ -929,42 +929,42 @@
 <context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="181"/>
+        <location filename="../core/configuredivecomputer.cpp" line="183"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Tidak dapat menyimpan berkas cadangan %1. Pesan Kegagalan: %2</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="197"/>
+        <location filename="../core/configuredivecomputer.cpp" line="199"/>
         <source>Could not open backup file: %1</source>
         <translation>Tidak dapat membuka berkas cadangan: %1</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="545"/>
+        <location filename="../core/configuredivecomputer.cpp" line="547"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="554"/>
+        <location filename="../core/configuredivecomputer.cpp" line="556"/>
         <source>Setting successfully written to device</source>
         <translation>Penataan berhasil ditulis ke perangkat</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="563"/>
+        <location filename="../core/configuredivecomputer.cpp" line="565"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="572"/>
+        <location filename="../core/configuredivecomputer.cpp" line="574"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="588"/>
+        <location filename="../core/configuredivecomputer.cpp" line="590"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="607"/>
+        <location filename="../core/configuredivecomputer.cpp" line="609"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2531,93 +2531,93 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Type</source>
         <translation>Tipe</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Size</source>
         <translation>Ukuran</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Work press.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../qt-models/cylindermodel.cpp" line="26"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="27"/>
         <source>Start press.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>End press.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>O₂%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Deco switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Bot. MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>MND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Use</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="53"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="54"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="57"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="58"/>
         <source>ℓ</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="237"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="238"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="248"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="249"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="250"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="251"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max. depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="252"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max. depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="235"/>
+        <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 type="unfinished"/>
     </message>
@@ -2625,54 +2625,54 @@
 <context>
     <name>DiveComponentSelection</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="487"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
         <source>Dive site: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="489"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
         <source>Dive master: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="491"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
         <source>Buddy: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="493"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="494"/>
         <source>Rating: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="495"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="496"/>
         <source>Visibility: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="497"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="498"/>
         <source>Notes:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="499"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="500"/>
         <source>Suit: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="501"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="511"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="512"/>
         <source>Cylinders:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="519"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/>
         <source>Weights:
 </source>
         <translation type="unfinished"/>
@@ -3045,38 +3045,38 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="186"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="187"/>
         <source> (cyl. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="190"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
         <source>ICD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
         <source>ΔHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="193"/>
         <source>ΔN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="213"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="214"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="215"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>Mulai</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="217"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>Akhir</translation>
@@ -3085,27 +3085,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="37"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="38"/>
         <source>Date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="39"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="40"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="41"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="42"/>
         <source>Depth</source>
         <translation>edalaman</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>min</source>
         <translation>menit</translation>
     </message>
@@ -3170,117 +3170,117 @@ GPS location:</source>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="911"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="912"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="913"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="914"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="918"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="921"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="923"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="937"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="938"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="939"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="940"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="943"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="945"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="948"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="949"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="950"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="951"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="954"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="955"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="956"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
         <source>Load media from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="961"/>
         <source>Load media from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="986"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="987"/>
         <source>Open media files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="989"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
         <source>Media files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
         <source>Image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
         <source>Video files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="993"/>
         <source>All files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="1041"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="1042"/>
         <source>%1 does not appear to be an image</source>
         <translation type="unfinished"/>
     </message>
@@ -3546,7 +3546,7 @@ GPS location:</source>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="559"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="113"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="115"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="412"/>
         <source>Light</source>
         <translation type="unfinished"/>
@@ -3558,157 +3558,157 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
         <source>Send the dive data to dive-share.appspot.com website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
         <source>Subsurface dive sites native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
         <source>Write dive as TeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
         <source>Write dive as LaTeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
         <source>Write the profile image as PNG file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="108"/>
         <source>Write profile data to a CSV file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
         <source>UDDF files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/>
         <source>CSV files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="201"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="203"/>
         <source>HTML files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="165"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Subsurface files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="175"/>
         <source>Export Subsurface dive sites XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>TeX files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="164"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="182"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>Export to TeX file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Save profile image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="196"/>
         <source>Save profile data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="200"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="202"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="214"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="216"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="249"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="482"/>
+        <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 type="unfinished"/>
     </message>
@@ -4091,62 +4091,62 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="171"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="173"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="272"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="274"/>
         <source>cyl.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="378"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="390"/>
         <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1026"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1028"/>
         <source>min</source>
         <translation>menit</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1032"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1034"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1035"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1037"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1082"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1084"/>
         <source>Stop times</source>
         <translation type="unfinished"/>
     </message>
@@ -4356,12 +4356,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveSiteSortedModel</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="271"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="278"/>
         <source>Delete dive site?</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../qt-models/divelocationmodel.cpp" line="272"/>
+        <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 type="unfinished"><numerusform></numerusform></translation>
@@ -4370,186 +4370,186 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModelBase</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="66"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="274"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="314"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="208"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="275"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="276"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="316"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="277"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="317"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="211"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="278"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="318"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="279"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
         <source>Rating</source>
         <translation>Peringkat</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="282"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="322"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="283"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="323"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="217"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="324"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="325"/>
         <source>Temp.(°%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="288"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="328"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="222"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="289"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="329"/>
         <source>Suit</source>
         <translation>Pakaian</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="223"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="290"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="330"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="291"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="331"/>
         <source>Cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="225"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="292"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="332"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="293"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="333"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>/min</source>
         <translation>/menit</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="231"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="296"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="338"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="297"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="234"/>
         <source>Max. CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="300"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="342"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="301"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="343"/>
         <source>Tags</source>
         <translation>Tag</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="237"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="344"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="238"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="345"/>
         <source>Media before/during/after dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="304"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="240"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="305"/>
         <source>Country</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="241"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="306"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="346"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="242"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="307"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="347"/>
         <source>Buddy</source>
         <translation>Rekan</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="243"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="308"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="348"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="309"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="349"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="280"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="281"/>
         <source>Depth</source>
         <translation>edalaman</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="284"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
         <source>Temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="286"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="287"/>
         <source>Weight</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="294"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="295"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="298"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="340"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="299"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="341"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="302"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="303"/>
         <source>Media</source>
         <translation type="unfinished"/>
     </message>
@@ -4557,106 +4557,106 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="243"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="279"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="526"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="717"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="528"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="719"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="562"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="594"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="635"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="667"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="669"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="681"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="683"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="693"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="682"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="692"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="694"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="160"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="491"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="162"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="493"/>
         <source>No dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="170"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="172"/>
         <source>Stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="180"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="182"/>
         <source>Failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="718"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="720"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="731"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="734"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="737"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="739"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="740"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="742"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="751"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="753"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -4721,73 +4721,73 @@ Existing Site</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="86"/>
         <source>Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="90"/>
         <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="177"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="180"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="202"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="205"/>
         <source>Connecting to dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/>
         <source>Error</source>
         <translation>Kesalahan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Garmin dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/>
         <source>Cancel download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="430"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="455"/>
         <source>Choose file for dive computer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="431"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
         <source>Log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="481"/>
         <source>Choose file for dive computer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="457"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="482"/>
         <source>Dump files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="485"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="510"/>
         <source>Retry download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="444"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="469"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="445"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="470"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
@@ -4874,10 +4874,10 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="303"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="392"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="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="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="334"/>
         <source>Download</source>
         <translation type="unfinished"/>
@@ -4908,7 +4908,7 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="340"/>
         <source>Cancel</source>
         <translation>Batal</translation>
@@ -4924,72 +4924,72 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/>
         <source> Vendor name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="97"/>
         <source>USB device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="105"/>
         <source> Dive Computer:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="145"/>
         <source> Connection:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/>
         <source> Previously used dive computers: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/>
         <source>Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <source>Quit</source>
         <translation>Keluar</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="312"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="316"/>
         <source>Rescan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="321"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="325"/>
         <source> Downloaded dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="322"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="326"/>
         <source>Info:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="345"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="349"/>
         <source>force downloading all dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="383"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="387"/>
         <source>Accept</source>
         <translation>Terima</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="403"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="407"/>
         <source>Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="412"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="416"/>
         <source>Unselect All</source>
         <translation type="unfinished"/>
     </message>
@@ -4997,7 +4997,7 @@ Existing Site</source>
 <context>
     <name>DownloadThread</name>
     <message>
-        <location filename="../core/downloadfromdcthread.cpp" line="101"/>
+        <location filename="../core/downloadfromdcthread.cpp" line="102"/>
         <source>No new dives downloaded from dive computer</source>
         <translation type="unfinished"/>
     </message>
@@ -5005,7 +5005,7 @@ Existing Site</source>
 <context>
     <name>EditBuddies</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="602"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="638"/>
         <source>buddies</source>
         <translation type="unfinished"/>
     </message>
@@ -5013,7 +5013,7 @@ Existing Site</source>
 <context>
     <name>EditDiveMaster</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="625"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="661"/>
         <source>dive master</source>
         <translation type="unfinished"/>
     </message>
@@ -5021,15 +5021,23 @@ Existing Site</source>
 <context>
     <name>EditMode</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="440"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="454"/>
         <source>dive mode</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>EditNumber</name>
+    <message>
+        <location filename="../desktop-widgets/command_edit.cpp" line="475"/>
+        <source>number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditTags</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="570"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="606"/>
         <source>tags</source>
         <translation type="unfinished"/>
     </message>
@@ -5037,7 +5045,7 @@ Existing Site</source>
 <context>
     <name>EditTagsBase</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="511"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="547"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation type="unfinished"><numerusform></numerusform></translation>
@@ -5092,129 +5100,134 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="47"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="41"/>
         <source>Reset / close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="57"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="102"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="123"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="140"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="64"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="58"/>
         <source>People</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="71"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="95"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="147"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="189"/>
+        <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"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="78"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="72"/>
         <source>Rating</source>
         <translation>Peringkat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="85"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="79"/>
         <source>Tags</source>
         <translation>Tag</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="109"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="103"/>
         <source>From</source>
         <translation>Dari</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="116"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="110"/>
         <source>To</source>
         <translation>Menuju</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="133"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="127"/>
         <source>Visibility</source>
         <translation>Jarak Lihat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="163"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="157"/>
         <source>Equipment</source>
         <translation>Perlengkapan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="179"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="173"/>
         <source>Water Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="196"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="190"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="203"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="197"/>
         <source>Suit</source>
         <translation>Pakaian</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="210"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="204"/>
         <source>Notes</source>
         <translation>Catatan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="217"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="211"/>
         <source>Air Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="276"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="270"/>
         <source>Logged</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="286"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="280"/>
         <source>Planned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="330"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="310"/>
+        <source>Close filters</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="345"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="364"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="383"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="402"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="421"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="440"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="350"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="369"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="388"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="407"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="426"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="445"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="355"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="374"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="393"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="412"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="431"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="450"/>
+        <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 type="unfinished"/>
     </message>
@@ -5224,7 +5237,6 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="316"/>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="124"/>
         <source>Close and reset filters</source>
         <translation type="unfinished"/>
@@ -5307,12 +5319,12 @@ Existing Site</source>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2225"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2227"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2230"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2232"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -5328,7 +5340,7 @@ Existing Site</source>
 <context>
     <name>GasSelectionModel</name>
     <message>
-        <location filename="../qt-models/models.cpp" line="38"/>
+        <location filename="../qt-models/models.cpp" line="39"/>
         <source>cyl.</source>
         <translation type="unfinished"/>
     </message>
@@ -5372,7 +5384,7 @@ Existing Site</source>
 <context>
     <name>GpsLocation</name>
     <message>
-        <location filename="../core/gpslocation.cpp" line="132"/>
+        <location filename="../core/gpslocation.cpp" line="134"/>
         <source>Unknown GPS location (no GPS source)</source>
         <translation type="unfinished"/>
     </message>
@@ -5586,9 +5598,9 @@ Existing Site</source>
     <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="30"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="504"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="450"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="511"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="512"/>
         <source>Notes</source>
@@ -5614,21 +5626,21 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="110"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="228"/>
+        <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>Temperatur Udara</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="120"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="229"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="225"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="496"/>
         <source>Water temp.</source>
         <translation>Temperatur air</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="195"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="545"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="498"/>
         <source>Location</source>
         <translation>Lokasi</translation>
@@ -5671,25 +5683,24 @@ Existing Site</source>
         <translation>Jarak Lihat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="343"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
         <source>Suit</source>
         <translation>Pakaian</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="402"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="398"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="509"/>
         <source>Tags</source>
         <translation>Tag</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="412"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="62"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="513"/>
         <source>Equipment</source>
         <translation>Perlengkapan</translation>
@@ -5707,93 +5718,93 @@ Existing Site</source>
         <translation>Rentang Waktu</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="70"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/>
         <source>Extra Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="64"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
         <source>Information</source>
         <translation>Informasi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="66"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="65"/>
         <source>Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="68"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="67"/>
         <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="71"/>
         <source>Dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="91"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="90"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="95"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="94"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="99"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="731"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="735"/>
         <source>Warning: edited %1 dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="225"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="221"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="226"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="222"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="264"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="260"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="266"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="262"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="494"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="458"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="489"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="491"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="686"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="690"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="687"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="691"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -5861,7 +5872,7 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="494"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="535"/>
         <source>Open</source>
         <translation>Buka</translation>
@@ -6280,45 +6291,45 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="485"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="532"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1514"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="491"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="691"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="655"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
+        <location filename="../desktop-widgets/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"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="692"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="693"/>
         <source>Trying to merge dives with %1min interval in between</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="256"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
         <source>Template backup created</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="258"/>
         <source>The following backup printing templates were created:
 
 %1
@@ -6332,229 +6343,229 @@ can overwrite them on startup.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="607"/>
         <source>Please save or cancel the current dive edit before going online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="620"/>
         <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="629"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="630"/>
         <source>Failure taking cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="703"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="806"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="857"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="858"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="914"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1669"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1772"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>multiple files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1750"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1766"/>
         <source>Open dive site file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1016"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1017"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1284"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/>
         <source>Dive log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1263"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1543"/>
-        <source>Subsurface files</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
-        <source>Cochran</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1559"/>
+        <source>Subsurface files</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
-        <source>DiveLogs.de</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+        <source>Cochran</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
-        <source>JDiveLog</source>
+        <source>DiveLogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
-        <source>Liquivision</source>
+        <source>JDiveLog</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
-        <source>Suunto</source>
+        <source>Liquivision</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
-        <source>UDCF</source>
+        <source>Suunto</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
-        <source>UDDF</source>
+        <source>UDCF</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
-        <source>XML</source>
+        <source>UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
-        <source>Divesoft</source>
+        <source>XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
-        <source>Datatrak/WLog</source>
+        <source>Divesoft</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
-        <source>MkVI files</source>
+        <source>Datatrak/WLog</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
-        <source>APD log viewer</source>
+        <source>MkVI files</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1276"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
-        <source>OSTCtools</source>
+        <source>APD log viewer</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
+        <source>OSTCtools</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
         <source>DAN DL7</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
         <source>CSV</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/>
         <source>All files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/>
         <source>Dive site files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="618"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1349"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Perubahan akan hilang jika anda tidak simpan.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1542"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1558"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1630"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1646"/>
         <source>[local cache for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1631"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1647"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1698"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1699"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1723"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1739"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
@@ -6674,7 +6685,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
 <context>
     <name>PasteDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="728"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="760"/>
         <source>Paste onto %n dive(s)</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
@@ -6907,22 +6918,32 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="14"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Subsurface files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
+        <source>Couldn&apos;t execute ffmpeg at given location. Thumbnailing will not work.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="70"/>
         <source>Select ffmpeg executable</source>
         <translation type="unfinished"/>
     </message>
@@ -7170,7 +7191,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="12"/>
         <source>Profile</source>
         <translation type="unfinished"/>
     </message>
@@ -7806,17 +7827,17 @@ Please export this template to a different file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="840"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="837"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1451"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1435"/>
         <source>Make first dive computer</source>
         <translation type="unfinished"/>
     </message>
@@ -7831,103 +7852,103 @@ Please export this template to a different file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1440"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
         <source>Delete this dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1441"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Split this dive computer into own dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1457"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
         <source> (cyl. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1463"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
         <source>Add setpoint change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1465"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1462"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1467"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1464"/>
         <source>Split dive into two</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1477"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
         <source>Change divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1501"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1498"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1505"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1502"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1507"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1517"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1548"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1555"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1545"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1552"/>
         <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1570"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1567"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1630"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1631"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1786"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1783"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1787"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1784"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1792"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1789"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -7935,146 +7956,151 @@ Please export this template to a different file.</source>
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="206"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="207"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="275"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/>
         <source>Open local dive data file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="283"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Opening local data file failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/>
         <source>%1 dives loaded from local dive data file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="425"/>
         <source>Error parsing local storage, giving up</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="427"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="434"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="428"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="504"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="473"/>
         <source>Invalid format for email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="544"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="552"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="559"/>
         <source>No response from cloud server to validate the credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="567"/>
         <source>Incorrect cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="566"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="593"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="600"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="607"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="628"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="634"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="641"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="646"/>
         <source>Cloud credentials valid, loading dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="649"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="656"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="695"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="702"/>
         <source>Loading dives from local storage (&apos;no cloud&apos; mode)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="748"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="766"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="942"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="953"/>
         <source>min</source>
         <translation>menit</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1479"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1048"/>
+        <source>weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1493"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -8090,15 +8116,15 @@ Please export this template to a different file.</source>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2151"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2153"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2148"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2131"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2139"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2150"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -8119,23 +8145,23 @@ Please export this template to a different file.</source>
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="138"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="139"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="90"/>
         <source>New starting number</source>
         <translation>Nomor Awal baru</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="136"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="137"/>
         <source>New number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="141"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
         <source>Renumber selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="143"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="144"/>
         <source>Renumber all dives</source>
         <translation type="unfinished"/>
     </message>
@@ -8143,7 +8169,7 @@ Please export this template to a different file.</source>
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2248"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2250"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -8452,38 +8478,38 @@ Not all media files have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="284"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="285"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="286"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="287"/>
         <source>Image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="367"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="368"/>
         <source>Selected dive date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="369"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
         <source>First selected dive date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="371"/>
         <source>Last selected dive date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="372"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/>
         <source>
 Files with inappropriate date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="382"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="383"/>
         <source>No Exif date/time found</source>
         <translation type="unfinished"/>
     </message>
@@ -8585,28 +8611,28 @@ Files with inappropriate date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
         <source>Open SmartTrak files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
         <source>SmartTrak files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>All files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>Subsurface files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
         <source>Open Subsurface files</source>
         <translation type="unfinished"/>
     </message>
@@ -8670,25 +8696,45 @@ Files with inappropriate date/time</source>
         <translation>Perlengkapan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="48"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.ui" line="74"/>
+        <source>Suit</source>
+        <translation>Pakaian</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
         <source>Cylinders</source>
         <translation>Tabung</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="49"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="56"/>
         <source>Weights</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="60"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="64"/>
+        <source>Undo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="306"/>
+        <source>Warning: edited %1 dives</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>TabDiveExtraInfo</name>
@@ -8796,29 +8842,29 @@ Files with inappropriate date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="75"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="76"/>
         <source>/min</source>
         <translation>/menit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>min</source>
         <translation>menit</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>d</source>
         <translation type="unfinished"/>
     </message>
@@ -9307,7 +9353,7 @@ mixed from Air and using:
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
@@ -9609,12 +9655,12 @@ Language: %1</source>
     <name>VideoFrameExtractor</name>
     <message>
         <location filename="../core/videoframeextractor.cpp" line="93"/>
-        <source>ffmpeg failed to start - video thumbnail creation suspended</source>
+        <source>ffmpeg failed to start - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/videoframeextractor.cpp" line="99"/>
-        <source>failed waiting for ffmpeg - video thumbnail creation suspended</source>
+        <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"/>
     </message>
 </context>
@@ -9682,12 +9728,12 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="331"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="352"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -9705,7 +9751,7 @@ Language: %1</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-models/weightmodel.cpp" line="72"/>
+        <location filename="../qt-models/weightmodel.cpp" line="71"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
@@ -9713,15 +9759,15 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2198"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2200"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2195"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2179"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2189"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2197"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -9839,7 +9885,7 @@ Rata-rata</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="801"/>
+        <location filename="../core/libdivecomputer.c" line="802"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -9850,7 +9896,7 @@ Rata-rata</translation>
         <location filename="../core/cochran.c" line="306"/>
         <location filename="../core/cochran.c" line="312"/>
         <location filename="../core/cochran.c" line="382"/>
-        <location filename="../core/libdivecomputer.c" line="244"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deco stop</source>
         <translation>pemberhentian deco</translation>
     </message>
@@ -9858,7 +9904,7 @@ Rata-rata</translation>
         <location filename="../core/cochran.c" line="333"/>
         <location filename="../core/cochran.c" line="387"/>
         <location filename="../core/import-csv.c" line="680"/>
-        <location filename="../core/libdivecomputer.c" line="246"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>ascent</source>
         <translation>nai</translation>
     </message>
@@ -9870,20 +9916,20 @@ Rata-rata</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="345"/>
-        <location filename="../core/libdivecomputer.c" line="262"/>
+        <location filename="../core/libdivecomputer.c" line="263"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="350"/>
-        <location filename="../core/libdivecomputer.c" line="261"/>
+        <location filename="../core/libdivecomputer.c" line="262"/>
         <source>maxdepth</source>
         <translation>dalam maks</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="355"/>
         <location filename="../core/cochran.c" line="401"/>
-        <location filename="../core/libdivecomputer.c" line="263"/>
+        <location filename="../core/libdivecomputer.c" line="264"/>
         <source>pO₂</source>
         <translation type="unfinished"/>
     </message>
@@ -9892,8 +9938,8 @@ Rata-rata</translation>
         <location filename="../core/cochran.c" line="411"/>
         <location filename="../core/cochran.c" line="418"/>
         <location filename="../core/import-csv.c" line="761"/>
-        <location filename="../core/libdivecomputer.c" line="254"/>
-        <location filename="../core/libdivecomputer.c" line="268"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="269"/>
         <location filename="../core/plannernotes.c" line="54"/>
         <source>gaschange</source>
         <translation>ganti gas</translation>
@@ -9901,101 +9947,101 @@ Rata-rata</translation>
     <message>
         <location filename="../core/cochran.c" line="367"/>
         <location filename="../core/cochran.c" line="406"/>
-        <location filename="../core/libdivecomputer.c" line="245"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="376"/>
         <location filename="../core/cochran.c" line="423"/>
-        <location filename="../core/libdivecomputer.c" line="247"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>ceiling</source>
         <translation>batas</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="392"/>
-        <location filename="../core/libdivecomputer.c" line="249"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>transmitter</source>
         <translation>pemancar</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="255"/>
+        <location filename="../core/datatrak.c" line="256"/>
         <source>clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="258"/>
+        <location filename="../core/datatrak.c" line="259"/>
         <source>misty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="261"/>
+        <location filename="../core/datatrak.c" line="262"/>
         <source>fog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="264"/>
+        <location filename="../core/datatrak.c" line="265"/>
         <source>rain</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="267"/>
+        <location filename="../core/datatrak.c" line="268"/>
         <source>storm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="270"/>
+        <location filename="../core/datatrak.c" line="271"/>
         <source>snow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="290"/>
+        <location filename="../core/datatrak.c" line="291"/>
         <source>No suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="293"/>
+        <location filename="../core/datatrak.c" line="294"/>
         <source>Shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="296"/>
+        <location filename="../core/datatrak.c" line="297"/>
         <source>Combi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="299"/>
+        <location filename="../core/datatrak.c" line="300"/>
         <source>Wet suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="302"/>
+        <location filename="../core/datatrak.c" line="303"/>
         <source>Semidry suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="305"/>
+        <location filename="../core/datatrak.c" line="306"/>
         <source>Dry suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="364"/>
+        <location filename="../core/datatrak.c" line="365"/>
         <source>no stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="366"/>
+        <location filename="../core/datatrak.c" line="367"/>
         <location filename="../core/tag.c" line="20"/>
         <source>deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="368"/>
+        <location filename="../core/datatrak.c" line="369"/>
         <source>single ascent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="370"/>
+        <location filename="../core/datatrak.c" line="371"/>
         <source>multiple ascent</source>
         <translation type="unfinished"/>
     </message>
@@ -10005,116 +10051,116 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="372"/>
+        <location filename="../core/datatrak.c" line="373"/>
         <source>fresh water</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="374"/>
+        <location filename="../core/datatrak.c" line="375"/>
         <source>salt water</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="395"/>
+        <location filename="../core/datatrak.c" line="396"/>
         <source>sight seeing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="397"/>
+        <location filename="../core/datatrak.c" line="398"/>
         <source>club dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="399"/>
+        <location filename="../core/datatrak.c" line="400"/>
         <location filename="../core/tag.c" line="19"/>
         <source>instructor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="401"/>
+        <location filename="../core/datatrak.c" line="402"/>
         <source>instruction</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="403"/>
+        <location filename="../core/datatrak.c" line="404"/>
         <location filename="../core/tag.c" line="18"/>
         <source>night</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="405"/>
+        <location filename="../core/datatrak.c" line="406"/>
         <location filename="../core/tag.c" line="16"/>
         <source>cave</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="407"/>
+        <location filename="../core/datatrak.c" line="408"/>
         <location filename="../core/tag.c" line="15"/>
         <source>ice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="409"/>
+        <location filename="../core/datatrak.c" line="410"/>
         <source>search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="416"/>
+        <location filename="../core/datatrak.c" line="417"/>
         <location filename="../core/tag.c" line="16"/>
         <source>wreck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="418"/>
+        <location filename="../core/datatrak.c" line="419"/>
         <location filename="../core/tag.c" line="17"/>
         <source>river</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="420"/>
+        <location filename="../core/datatrak.c" line="421"/>
         <location filename="../core/tag.c" line="14"/>
         <source>drift</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="422"/>
+        <location filename="../core/datatrak.c" line="423"/>
         <location filename="../core/tag.c" line="19"/>
         <source>photo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="424"/>
+        <location filename="../core/datatrak.c" line="425"/>
         <source>other</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="434"/>
+        <location filename="../core/datatrak.c" line="435"/>
         <source>Other activities</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="458"/>
+        <location filename="../core/datatrak.c" line="459"/>
         <source>Datatrak/Wlog notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="502"/>
+        <location filename="../core/datatrak.c" line="503"/>
         <source>[Warning] Manual dive # %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="528"/>
+        <location filename="../core/datatrak.c" line="529"/>
         <source>[Error] Out of memory for dive %d. Abort parsing.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="576"/>
+        <location filename="../core/datatrak.c" line="577"/>
         <source>[Error] File is not a DataTrak file. Aborted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="589"/>
+        <location filename="../core/datatrak.c" line="590"/>
         <source>Error: no dive</source>
         <translation type="unfinished"/>
     </message>
@@ -10164,30 +10210,30 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>OC-gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>diluent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../core/equipment.c" line="92"/>
-        <location filename="../core/planner.c" line="1158"/>
-        <location filename="../core/planner.c" line="1161"/>
+        <location filename="../core/equipment.c" line="45"/>
+        <location filename="../core/equipment.c" line="144"/>
+        <location filename="../core/planner.c" line="1179"/>
+        <location filename="../core/planner.c" line="1182"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>not used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="32"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
@@ -10200,17 +10246,17 @@ Rata-rata</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="622"/>
-        <location filename="../core/qthelper.cpp" line="814"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
+        <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="625"/>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1251"/>
+        <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>
@@ -10221,25 +10267,25 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1275"/>
+        <location filename="../core/qthelper.cpp" line="1277"/>
         <location filename="../core/units.c" line="65"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="538"/>
-        <location filename="../core/qthelper.cpp" line="553"/>
-        <location filename="../core/qthelper.cpp" line="732"/>
-        <location filename="../core/qthelper.cpp" line="1227"/>
+        <location filename="../core/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="541"/>
-        <location filename="../core/qthelper.cpp" line="555"/>
-        <location filename="../core/qthelper.cpp" line="734"/>
-        <location filename="../core/qthelper.cpp" line="1226"/>
+        <location filename="../core/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>
@@ -10265,86 +10311,86 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="564"/>
-        <location filename="../core/qthelper.cpp" line="574"/>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <location filename="../core/qthelper.cpp" line="1203"/>
+        <location filename="../core/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="132"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="133"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="562"/>
-        <location filename="../core/qthelper.cpp" line="572"/>
-        <location filename="../core/qthelper.cpp" line="787"/>
-        <location filename="../core/qthelper.cpp" line="1202"/>
+        <location filename="../core/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="130"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="131"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="678"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1154"/>
-        <location filename="../core/planner.c" line="1157"/>
+        <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>udara</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="90"/>
+        <location filename="../core/equipment.c" line="142"/>
         <source>EAN%d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="205"/>
+        <location filename="../core/equipment.c" line="252"/>
         <source>integrated</source>
         <translation>terintegrasi</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="206"/>
+        <location filename="../core/equipment.c" line="253"/>
         <source>belt</source>
         <translation>sabuk</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="207"/>
+        <location filename="../core/equipment.c" line="254"/>
         <source>ankle</source>
         <translation>Pergelangan kaki</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="208"/>
+        <location filename="../core/equipment.c" line="255"/>
         <source>backplate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="209"/>
+        <location filename="../core/equipment.c" line="256"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="116"/>
+        <location filename="../core/file.c" line="117"/>
         <source>No dives in the input file &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="334"/>
+        <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="53"/>
+        <location filename="../core/ostctools.c" line="54"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Gagal baca &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="221"/>
+        <location filename="../core/file.c" line="222"/>
         <source>Cannot open CSV file %s; please use Import log file dialog</source>
         <comment>'Import log file' should be the same text as corresponding label in Import menu</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="336"/>
+        <location filename="../core/file.c" line="337"/>
         <source>Empty file &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
@@ -10395,287 +10441,287 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="83"/>
+        <location filename="../core/git-access.c" line="85"/>
         <source>Checkout from storage (%lu/%lu)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="114"/>
+        <location filename="../core/git-access.c" line="116"/>
         <source>Transfer from storage (%d/%d)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="126"/>
+        <location filename="../core/git-access.c" line="128"/>
         <source>Transfer to storage (%d/%d)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="162"/>
+        <location filename="../core/git-access.c" line="164"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="185"/>
-        <location filename="../core/git-access.c" line="205"/>
+        <location filename="../core/git-access.c" line="187"/>
+        <location filename="../core/git-access.c" line="207"/>
         <source>Could not update local cache to newer remote data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="198"/>
+        <location filename="../core/git-access.c" line="200"/>
         <source>Subsurface cloud storage corrupted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="334"/>
+        <location filename="../core/git-access.c" line="336"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="394"/>
+        <location filename="../core/git-access.c" line="396"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="424"/>
+        <location filename="../core/git-access.c" line="426"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="458"/>
+        <location filename="../core/git-access.c" line="460"/>
         <source>Remote storage and local data diverged</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="461"/>
+        <location filename="../core/git-access.c" line="463"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="470"/>
+        <location filename="../core/git-access.c" line="472"/>
         <source>Problems with local cache of Subsurface cloud data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="471"/>
+        <location filename="../core/git-access.c" line="473"/>
         <source>Moved cache data to %s. Please try the operation again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="518"/>
+        <location filename="../core/git-access.c" line="520"/>
         <source>Update local storage to match cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="526"/>
+        <location filename="../core/git-access.c" line="528"/>
         <source>Push local changes to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="544"/>
+        <location filename="../core/git-access.c" line="546"/>
         <source>Try to merge local changes into cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="586"/>
+        <location filename="../core/git-access.c" line="588"/>
         <source>Store data into cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="610"/>
+        <location filename="../core/git-access.c" line="612"/>
         <source>Sync with cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="637"/>
+        <location filename="../core/git-access.c" line="639"/>
         <source>Can&apos;t reach cloud server, working with local data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="650"/>
+        <location filename="../core/git-access.c" line="652"/>
         <source>Successful cloud connection, fetch remote</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="669"/>
+        <location filename="../core/git-access.c" line="671"/>
         <source>Done syncing with cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="804"/>
+        <location filename="../core/git-access.c" line="806"/>
         <source>Error connecting to Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="807"/>
+        <location filename="../core/git-access.c" line="809"/>
         <source>git clone of %s failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="833"/>
+        <location filename="../core/git-access.c" line="835"/>
         <source>Synchronising data file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/import-divinglog.c" line="315"/>
-        <location filename="../core/libdivecomputer.c" line="230"/>
+        <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/uemis-downloader.c" line="197"/>
+        <location filename="../core/uemis-downloader.c" line="199"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="243"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>none</source>
         <translation>kosong</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="248"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>workload</source>
         <translation>beban kerja</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="250"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>violation</source>
         <translation>gangguan</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="251"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>bookmark</source>
         <translation>tandai</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="252"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>surface</source>
         <translation>permuakaan</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="253"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>safety stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>safety stop (voluntary)</source>
         <translation>safety stop (bebas)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="256"/>
+        <location filename="../core/libdivecomputer.c" line="257"/>
         <source>safety stop (mandatory)</source>
         <translation>safety stop (wajib)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="257"/>
+        <location filename="../core/libdivecomputer.c" line="258"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="258"/>
+        <location filename="../core/libdivecomputer.c" line="259"/>
         <source>ceiling (safety stop)</source>
         <translation>batas (safety stop)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="259"/>
+        <location filename="../core/libdivecomputer.c" line="260"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="260"/>
+        <location filename="../core/libdivecomputer.c" line="261"/>
         <source>divetime</source>
         <translation>waktu selam</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="264"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>airtime</source>
         <translation>waktu mengudara</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="265"/>
+        <location filename="../core/libdivecomputer.c" line="266"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="266"/>
+        <location filename="../core/libdivecomputer.c" line="267"/>
         <source>heading</source>
         <translation>judul</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="267"/>
+        <location filename="../core/libdivecomputer.c" line="268"/>
         <source>tissue level warning</source>
         <translation>peringatan tingkat jaringan</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="277"/>
+        <location filename="../core/libdivecomputer.c" line="278"/>
         <source>invalid event number</source>
         <translation>nomor kejadian tidak sesuai</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="613"/>
+        <location filename="../core/libdivecomputer.c" line="614"/>
         <source>Error parsing the datetime</source>
         <translation>Gagal mengurai tanggal</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="631"/>
+        <location filename="../core/libdivecomputer.c" line="632"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="637"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error parsing the divetime</source>
         <translation>Gagal mengurai waktu selam</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
+        <location filename="../core/libdivecomputer.c" line="648"/>
         <source>Error parsing the maxdepth</source>
         <translation>Gagal mengurai kedalamn maks</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="661"/>
+        <location filename="../core/libdivecomputer.c" line="662"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="680"/>
+        <location filename="../core/libdivecomputer.c" line="681"/>
         <source>Error parsing the gas mix count</source>
         <translation>Gagal mengurai perhitungan campuran gas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="691"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="700"/>
+        <location filename="../core/libdivecomputer.c" line="701"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
+        <location filename="../core/libdivecomputer.c" line="724"/>
         <source>Error obtaining dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="745"/>
+        <location filename="../core/libdivecomputer.c" line="746"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="771"/>
+        <location filename="../core/libdivecomputer.c" line="772"/>
         <source>Unable to create parser for %s %s</source>
         <translation>tidak dapat membuat pengurai untuk %s %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="778"/>
         <source>Error registering the data</source>
         <translation>Gagal mendaftarkan data</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="808"/>
+        <location filename="../core/libdivecomputer.c" line="809"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="815"/>
+        <location filename="../core/libdivecomputer.c" line="816"/>
         <source>Already downloaded dive at %s</source>
         <translation type="unfinished"/>
     </message>
@@ -10733,53 +10779,53 @@ You can create this logfile by selecting the corresponding checkbox in the downl
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="175"/>
-        <location filename="../core/parse-xml.c" line="1207"/>
+        <location filename="../core/load-git.c" line="186"/>
+        <location filename="../core/parse-xml.c" line="1208"/>
         <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="201"/>
-        <location filename="../core/parse.c" line="442"/>
+        <location filename="../core/load-git.c" line="211"/>
+        <location filename="../core/parse.c" line="443"/>
         <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1664"/>
+        <location filename="../core/load-git.c" line="1659"/>
         <source>Load dives from local cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1668"/>
+        <location filename="../core/load-git.c" line="1663"/>
         <source>Successfully opened dive data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="128"/>
-        <location filename="../core/ostctools.c" line="159"/>
+        <location filename="../core/ostctools.c" line="129"/>
+        <location filename="../core/ostctools.c" line="160"/>
         <source>Unknown DC in dive %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="171"/>
+        <location filename="../core/ostctools.c" line="172"/>
         <source>Error - %s - parsing dive %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="400"/>
+        <location filename="../core/parse-xml.c" line="401"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="1664"/>
+        <location filename="../core/parse-xml.c" line="1663"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2257"/>
+        <location filename="../core/parse-xml.c" line="2256"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -10806,7 +10852,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl
     </message>
     <message>
         <location filename="../core/planner.c" line="300"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="193"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="194"/>
         <source>SP change</source>
         <translation type="unfinished"/>
     </message>
@@ -11073,460 +11119,460 @@ You can create this logfile by selecting the corresponding checkbox in the downl
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="881"/>
+        <location filename="../core/planner.c" line="900"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1162"/>
+        <location filename="../core/planner.c" line="1183"/>
         <source>ean</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1406"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1407"/>
+        <location filename="../core/profile.c" line="1417"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1413"/>
+        <location filename="../core/profile.c" line="1423"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1416"/>
+        <location filename="../core/profile.c" line="1426"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1418"/>
+        <location filename="../core/profile.c" line="1428"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1427"/>
+        <location filename="../core/profile.c" line="1437"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1430"/>
+        <location filename="../core/profile.c" line="1440"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1470"/>
+        <location filename="../core/profile.c" line="1480"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1462"/>
+        <location filename="../core/profile.c" line="1472"/>
         <source>Safety stop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1403"/>
+        <location filename="../core/profile.c" line="1413"/>
         <source>P: %d%s (%s)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1420"/>
+        <location filename="../core/profile.c" line="1430"/>
         <source>pO₂: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1422"/>
+        <location filename="../core/profile.c" line="1432"/>
         <source>SCR ΔpO₂: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1425"/>
+        <location filename="../core/profile.c" line="1435"/>
         <source>pN₂: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1439"/>
+        <location filename="../core/profile.c" line="1449"/>
         <source>EAD: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1445"/>
+        <location filename="../core/profile.c" line="1455"/>
         <source>END: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1450"/>
+        <location filename="../core/profile.c" line="1460"/>
         <source>Density: %.1fg/ℓ
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1465"/>
+        <location filename="../core/profile.c" line="1475"/>
         <source>Safety stop: unknown time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1473"/>
+        <location filename="../core/profile.c" line="1483"/>
         <source>Deco: unknown time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1477"/>
+        <location filename="../core/profile.c" line="1487"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1479"/>
+        <location filename="../core/profile.c" line="1489"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1482"/>
+        <location filename="../core/profile.c" line="1492"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1485"/>
+        <location filename="../core/profile.c" line="1495"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1493"/>
+        <location filename="../core/profile.c" line="1503"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1496"/>
+        <location filename="../core/profile.c" line="1506"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1498"/>
+        <location filename="../core/profile.c" line="1508"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1502"/>
+        <location filename="../core/profile.c" line="1512"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1504"/>
+        <location filename="../core/profile.c" line="1514"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1517"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1510"/>
+        <location filename="../core/profile.c" line="1520"/>
         <source>Surface GF %.0f%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1513"/>
+        <location filename="../core/profile.c" line="1523"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1529"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1536"/>
         <source>ICD in leading tissue
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1528"/>
+        <location filename="../core/profile.c" line="1538"/>
         <source>heart rate: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1530"/>
+        <location filename="../core/profile.c" line="1540"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1533"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1630"/>
+        <location filename="../core/profile.c" line="1640"/>
         <source>ΔT:%d:%02dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1634"/>
+        <location filename="../core/profile.c" line="1644"/>
         <source>%s ΔD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1638"/>
+        <location filename="../core/profile.c" line="1648"/>
         <source>%s ↓D:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1642"/>
+        <location filename="../core/profile.c" line="1652"/>
         <source>%s ↑D:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1646"/>
+        <location filename="../core/profile.c" line="1656"/>
         <source>%s øD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1650"/>
+        <location filename="../core/profile.c" line="1660"/>
         <source>%s ↓V:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1654"/>
+        <location filename="../core/profile.c" line="1664"/>
         <source>%s ↑V:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1658"/>
+        <location filename="../core/profile.c" line="1668"/>
         <source>%s øV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1665"/>
+        <location filename="../core/profile.c" line="1675"/>
         <source>%s ΔP:%d%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1690"/>
+        <location filename="../core/profile.c" line="1700"/>
         <source>%s SAC:%.*f%s/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="68"/>
+        <location filename="../core/qthelper.cpp" line="70"/>
         <source>%1km</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="70"/>
+        <location filename="../core/qthelper.cpp" line="72"/>
         <source>%1m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="74"/>
+        <location filename="../core/qthelper.cpp" line="76"/>
         <source>%1mi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="76"/>
+        <location filename="../core/qthelper.cpp" line="78"/>
         <source>%1yd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="234"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="236"/>
         <source>N</source>
         <translation>U</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="235"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="237"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="236"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="238"/>
         <source>E</source>
         <translation>T</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="237"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="239"/>
         <source>W</source>
         <translation>B</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="583"/>
-        <location filename="../core/qthelper.cpp" line="760"/>
+        <location filename="../core/qthelper.cpp" line="585"/>
+        <location filename="../core/qthelper.cpp" line="762"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="586"/>
-        <location filename="../core/qthelper.cpp" line="762"/>
+        <location filename="../core/qthelper.cpp" line="588"/>
+        <location filename="../core/qthelper.cpp" line="764"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="837"/>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>AIR</source>
         <translation>UDARA</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="841"/>
         <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="914"/>
+        <location filename="../core/qthelper.cpp" line="916"/>
         <source>more than %1 days</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="960"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1274"/>
+        <location filename="../core/qthelper.cpp" line="1276"/>
         <source>l</source>
         <translation>I</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="480"/>
-        <location filename="../core/save-html.c" line="564"/>
-        <location filename="../core/worldmap-save.c" line="114"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="499"/>
+        <location filename="../core/save-html.c" line="501"/>
         <source>Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="500"/>
+        <location filename="../core/save-html.c" line="502"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="501"/>
+        <location filename="../core/save-html.c" line="503"/>
         <source>Time</source>
         <translation>Waktu</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="502"/>
+        <location filename="../core/save-html.c" line="504"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="503"/>
+        <location filename="../core/save-html.c" line="505"/>
         <source>Air temp.</source>
         <translation>Temperatur Udara</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="504"/>
+        <location filename="../core/save-html.c" line="506"/>
         <source>Water temp.</source>
         <translation>Temperatur air</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="507"/>
         <source>Dives</source>
         <translation>Selam</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="506"/>
+        <location filename="../core/save-html.c" line="508"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="507"/>
+        <location filename="../core/save-html.c" line="509"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="508"/>
+        <location filename="../core/save-html.c" line="510"/>
         <source>Trips</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../core/save-html.c" line="511"/>
         <source>Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="510"/>
+        <location filename="../core/save-html.c" line="512"/>
         <source>Advanced search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="513"/>
+        <location filename="../core/save-html.c" line="515"/>
         <source>Rating</source>
         <translation>Peringkat</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="514"/>
+        <location filename="../core/save-html.c" line="516"/>
         <source>Visibility</source>
         <translation>Jarak Lihat</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="515"/>
+        <location filename="../core/save-html.c" line="517"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="516"/>
+        <location filename="../core/save-html.c" line="518"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="517"/>
+        <location filename="../core/save-html.c" line="519"/>
         <source>Buddy</source>
         <translation>Rekan</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="518"/>
+        <location filename="../core/save-html.c" line="520"/>
         <source>Suit</source>
         <translation>Pakaian</translation>
     </message>
@@ -11537,180 +11583,180 @@ EADD: %d%s / %.1fg/ℓ
     </message>
     <message>
         <location filename="../core/divesite-helper.cpp" line="29"/>
-        <location filename="../core/save-html.c" line="519"/>
+        <location filename="../core/save-html.c" line="521"/>
         <source>Tags</source>
         <translation>Tag</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="520"/>
+        <location filename="../core/save-html.c" line="522"/>
         <location filename="../smtk-import/smartrak.c" line="257"/>
         <location filename="../smtk-import/smartrak.c" line="330"/>
         <source>Notes</source>
         <translation>Catatan</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="521"/>
+        <location filename="../core/save-html.c" line="523"/>
         <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="524"/>
+        <location filename="../core/save-html.c" line="526"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="525"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Year</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="526"/>
+        <location filename="../core/save-html.c" line="528"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="527"/>
+        <location filename="../core/save-html.c" line="529"/>
         <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="528"/>
+        <location filename="../core/save-html.c" line="530"/>
         <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="529"/>
+        <location filename="../core/save-html.c" line="531"/>
         <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="530"/>
+        <location filename="../core/save-html.c" line="532"/>
         <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="531"/>
+        <location filename="../core/save-html.c" line="533"/>
         <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="532"/>
+        <location filename="../core/save-html.c" line="534"/>
         <source>Max. depth</source>
         <translation>Kedalaman Maks.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="533"/>
+        <location filename="../core/save-html.c" line="535"/>
         <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="534"/>
+        <location filename="../core/save-html.c" line="536"/>
         <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="537"/>
         <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="536"/>
+        <location filename="../core/save-html.c" line="538"/>
         <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="537"/>
+        <location filename="../core/save-html.c" line="539"/>
         <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="538"/>
+        <location filename="../core/save-html.c" line="540"/>
         <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="539"/>
+        <location filename="../core/save-html.c" line="541"/>
         <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="542"/>
+        <location filename="../core/save-html.c" line="544"/>
         <source>Dive #</source>
         <translation>Selam#</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="543"/>
+        <location filename="../core/save-html.c" line="545"/>
         <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="544"/>
+        <location filename="../core/save-html.c" line="546"/>
         <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="545"/>
+        <location filename="../core/save-html.c" line="547"/>
         <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="555"/>
         <source>Type</source>
         <translation>Tipe</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="547"/>
+        <location filename="../core/save-html.c" line="549"/>
         <source>Size</source>
         <translation>Ukuran</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="550"/>
         <source>Work pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="549"/>
+        <location filename="../core/save-html.c" line="551"/>
         <source>Start pressure</source>
         <translation>Tekanan awal</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="550"/>
+        <location filename="../core/save-html.c" line="552"/>
         <source>End pressure</source>
         <translation>Tekanan akhir</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="551"/>
+        <location filename="../core/save-html.c" line="553"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="552"/>
+        <location filename="../core/save-html.c" line="554"/>
         <source>Weight</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="554"/>
+        <location filename="../core/save-html.c" line="556"/>
         <source>Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="555"/>
+        <location filename="../core/save-html.c" line="557"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="556"/>
+        <location filename="../core/save-html.c" line="558"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="557"/>
+        <location filename="../core/save-html.c" line="559"/>
         <source>Coordinates</source>
         <translation>Koordinat</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="558"/>
+        <location filename="../core/save-html.c" line="560"/>
         <source>Dive status</source>
         <translation type="unfinished"/>
     </message>
@@ -11730,17 +11776,17 @@ EADD: %d%s / %.1fg/ℓ
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/dive.c" line="29"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="34"/>
+        <location filename="../core/dive.c" line="30"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="35"/>
+        <location filename="../core/dive.c" line="31"/>
         <source>Freedive</source>
         <translation type="unfinished"/>
     </message>
@@ -11750,177 +11796,177 @@ EADD: %d%s / %.1fg/ℓ
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Feb</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Mar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Apr</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>May</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jun</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Jul</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Aug</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Sep</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Oct</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Nov</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Dec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="32"/>
+        <location filename="../core/uemis-downloader.c" line="34"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="33"/>
+        <location filename="../core/uemis-downloader.c" line="35"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="34"/>
+        <location filename="../core/uemis-downloader.c" line="36"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="35"/>
+        <location filename="../core/uemis-downloader.c" line="37"/>
         <source>No dives to download.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="499"/>
+        <location filename="../core/uemis-downloader.c" line="501"/>
         <source>%s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="535"/>
+        <location filename="../core/uemis-downloader.c" line="537"/>
         <source>data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="563"/>
+        <location filename="../core/uemis-downloader.c" line="565"/>
         <source>dive log #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="565"/>
+        <location filename="../core/uemis-downloader.c" line="567"/>
         <source>dive spot #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="567"/>
+        <location filename="../core/uemis-downloader.c" line="569"/>
         <source>details for #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>wetsuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>semidry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>drysuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>vest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>long john</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>jacket</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>2 pcs full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>membrane</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1336"/>
+        <location filename="../core/uemis-downloader.c" line="1338"/>
         <source>Initialise communication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1339"/>
+        <location filename="../core/uemis-downloader.c" line="1341"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1351"/>
+        <location filename="../core/uemis-downloader.c" line="1353"/>
         <source>Start download</source>
         <translation type="unfinished"/>
     </message>
@@ -12015,76 +12061,76 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="42"/>
+        <location filename="../core/worldmap-save.c" line="44"/>
         <source>Date:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="44"/>
+        <location filename="../core/worldmap-save.c" line="46"/>
         <source>Time:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="46"/>
+        <location filename="../core/worldmap-save.c" line="48"/>
         <source>Duration:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
+        <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="140"/>
-        <location filename="../core/worldmap-save.c" line="47"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
+        <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>menit</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="140"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="100"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/qthelper.h" line="76"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="152"/>
+        <location filename="../core/divelogexportlogic.cpp" line="153"/>
         <source>Cannot find a folder called &apos;theme&apos; in the standard locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="50"/>
+        <location filename="../core/worldmap-save.c" line="52"/>
         <source>Max. depth:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="53"/>
+        <location filename="../core/worldmap-save.c" line="55"/>
         <source>Air temp.:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="56"/>
+        <location filename="../core/worldmap-save.c" line="58"/>
         <source>Water temp.:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="58"/>
+        <location filename="../core/worldmap-save.c" line="60"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="62"/>
+        <location filename="../core/worldmap-save.c" line="64"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
@@ -12204,27 +12250,27 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="914"/>
+        <location filename="../core/save-git.c" line="916"/>
         <source>Start saving data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="923"/>
+        <location filename="../core/save-git.c" line="925"/>
         <source>Start saving dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="956"/>
+        <location filename="../core/save-git.c" line="958"/>
         <source>Done creating local cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="1207"/>
+        <location filename="../core/save-git.c" line="1209"/>
         <source>Preparing to save data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1661"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1658"/>
         <source>modechange</source>
         <translation type="unfinished"/>
     </message>
@@ -12239,57 +12285,57 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="558"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="559"/>
         <source>Don&apos;t save an empty log to the cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="46"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/>
         <source>Average</source>
         <translation>Rata-rata</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="49"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
         <source>Minimum</source>
         <translation>Minimal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="52"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
         <source>Maximum</source>
         <translation>Maksimal</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="406"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="414"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="460"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="467"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="121"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="122"/>
         <source>/min</source>
         <translation>/menit</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="743"/>
+        <location filename="../core/save-xml.c" line="749"/>
         <source>Failed to save dives to %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="864"/>
+        <location filename="../core/save-xml.c" line="871"/>
         <source>Failed to save divesites to %s (%s)</source>
         <translation type="unfinished"/>
     </message>
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index 6e80f33af..461b5fab8 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -405,7 +405,7 @@
 <context>
     <name>CloudStorageAuthenticate</name>
     <message>
-        <location filename="../core/cloudstorage.cpp" line="65"/>
+        <location filename="../core/cloudstorage.cpp" line="66"/>
         <source>Cloud account verification required, enter PIN in preferences</source>
         <translation>Cloud account vereist verificatie, voer PIN in bij de voorkeuren</translation>
     </message>
@@ -611,7 +611,7 @@
         <translation>Opnieuw</translation>
     </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="78"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="92"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation><numerusform>Bewerk %1 (%n duik)</numerusform><numerusform>Bewerk %1 (%n duiken)</numerusform></translation>
@@ -684,7 +684,7 @@
 <context>
     <name>Command::EditAirTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="227"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="241"/>
         <source>air temperature</source>
         <translation>luchttemperatuur</translation>
     </message>
@@ -692,7 +692,7 @@
 <context>
     <name>Command::EditAtmPress</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="272"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="286"/>
         <source>Atm. pressure</source>
         <translation>Atm. druk</translation>
     </message>
@@ -700,7 +700,7 @@
 <context>
     <name>Command::EditDepth</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="320"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="334"/>
         <source>depth</source>
         <translation>diepte</translation>
     </message>
@@ -708,7 +708,7 @@
 <context>
     <name>Command::EditDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="342"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="356"/>
         <source>dive site</source>
         <translation>duikstek</translation>
     </message>
@@ -764,7 +764,7 @@
 <context>
     <name>Command::EditDuration</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="296"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="310"/>
         <source>duration</source>
         <translation>duur</translation>
     </message>
@@ -772,7 +772,7 @@
 <context>
     <name>Command::EditNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="142"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="156"/>
         <source>notes</source>
         <translation>notities</translation>
     </message>
@@ -780,7 +780,7 @@
 <context>
     <name>Command::EditRating</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="185"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="199"/>
         <source>rating</source>
         <translation>waardering</translation>
     </message>
@@ -788,7 +788,7 @@
 <context>
     <name>Command::EditSuit</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="164"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="178"/>
         <source>suit</source>
         <translation>duikpak</translation>
     </message>
@@ -820,7 +820,7 @@
 <context>
     <name>Command::EditVisibility</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="206"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="220"/>
         <source>visibility</source>
         <translation>Zicht</translation>
     </message>
@@ -828,7 +828,7 @@
 <context>
     <name>Command::EditWaterTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="251"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="265"/>
         <source>water temperature</source>
         <translation>watertemperatuur</translation>
     </message>
@@ -932,42 +932,42 @@
 <context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="181"/>
+        <location filename="../core/configuredivecomputer.cpp" line="183"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Kan het backup bestand %1 niet opslaan. Foutmelding: %2</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="197"/>
+        <location filename="../core/configuredivecomputer.cpp" line="199"/>
         <source>Could not open backup file: %1</source>
         <translation>Kan het backup bestand niet openen: %1</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="545"/>
+        <location filename="../core/configuredivecomputer.cpp" line="547"/>
         <source>Dive computer details read successfully</source>
         <translation>Details duikcomputer opgehaald.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="554"/>
+        <location filename="../core/configuredivecomputer.cpp" line="556"/>
         <source>Setting successfully written to device</source>
         <translation>Instelling bewaard op het toestel</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="563"/>
+        <location filename="../core/configuredivecomputer.cpp" line="565"/>
         <source>Device firmware successfully updated</source>
         <translation>Firmware van het toestel succesvol aangepast</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="572"/>
+        <location filename="../core/configuredivecomputer.cpp" line="574"/>
         <source>Device settings successfully reset</source>
         <translation>Instellingen van het toestel teruggesteld</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="588"/>
+        <location filename="../core/configuredivecomputer.cpp" line="590"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan geen context creëren voor libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="607"/>
+        <location filename="../core/configuredivecomputer.cpp" line="609"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kon geen verbinding maken met de duikcomputer.</translation>
     </message>
@@ -2536,93 +2536,93 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Work press.</source>
         <translation>Werkdruk</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../qt-models/cylindermodel.cpp" line="26"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="27"/>
         <source>Start press.</source>
         <translation>Startdruk</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>End press.</source>
         <translation>Einddruk</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>O₂%</source>
         <translation>O₂%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Deco switch at</source>
         <translation>Wissel op</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Bot. MOD</source>
         <translation>Bodemgas MOD</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>MND</source>
         <translation>MND</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Use</source>
         <translation>Gebruik</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="53"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="54"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="57"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="58"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="237"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="238"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klik hier om de fles te verwijderen.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="248"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="249"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation>Wissel diepte voor deco gas. Berekend mbv. Deco pO₂ voorkeur, tenzij manueel ingesteld.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="250"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="251"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max. depth.</source>
         <translation>Berekend mbv. Bodem pO₂ voorkeur. Instelling MOD bepaalt O₂%, zet op &apos;*&apos; voor beste O₂% voor maximum diepte.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="252"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max. depth.</source>
         <translation>Berekend mbv. Best Mix END voorkeur. Instelling MND bepaalt He%, zet op &apos;*&apos; voor beste He% voor maximum diepte.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="235"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="236"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden tijdens deze duik kunnen verwijderd worden.</translation>
     </message>
@@ -2630,54 +2630,54 @@
 <context>
     <name>DiveComponentSelection</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="487"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
         <source>Dive site: </source>
         <translation>Duikstek:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="489"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
         <source>Dive master: </source>
         <translation>Duikleider:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="491"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
         <source>Buddy: </source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="493"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="494"/>
         <source>Rating: </source>
         <translation>Waardering:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="495"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="496"/>
         <source>Visibility: </source>
         <translation>Zicht:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="497"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="498"/>
         <source>Notes:
 </source>
         <translation>Notities:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="499"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="500"/>
         <source>Suit: </source>
         <translation>Pak:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="501"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
         <source>Tags: </source>
         <translation>Trefwoorden:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="511"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="512"/>
         <source>Cylinders:
 </source>
         <translation>Flessen:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="519"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/>
         <source>Weights:
 </source>
         <translation>Gewichten</translation>
@@ -3052,38 +3052,38 @@ GPS locatie:</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="186"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="187"/>
         <source> (cyl. %1)</source>
         <translation> (fles %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="190"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
         <source>ICD</source>
         <translation>ICD</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
         <source>ΔHe</source>
         <translation>ΔHe</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="193"/>
         <source>ΔN₂</source>
         <translation>ΔN₂</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="213"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="214"/>
         <source>Manual switch to OC</source>
         <translation>Handmatig overschakelen naar OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="215"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> begin</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="217"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> eind</translation>
@@ -3092,27 +3092,27 @@ GPS locatie:</translation>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="37"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="38"/>
         <source>Date/time</source>
         <translation>Datum/tijd</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="39"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="40"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="41"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="42"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -3177,117 +3177,117 @@ GPS locatie:</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="911"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="912"/>
         <source>Expand all</source>
         <translation>Alles uitklappen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="913"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="914"/>
         <source>Collapse all</source>
         <translation>Alles inklappen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="918"/>
         <source>Collapse others</source>
         <translation>Andere samenklappen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="921"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
         <source>Remove dive(s) from trip</source>
         <translation>Duik(en) uit trip verwijderen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="923"/>
         <source>Create new trip above</source>
         <translation>Nieuwe trip hierboven invoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="937"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="938"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Duik(en) toevoegen aan de trip hierboven</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="939"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="940"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Duik(en) toevoegen aan de trip hieronder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="943"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
         <source>Merge trip with trip above</source>
         <translation>Trip met bovenstaande samenvoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="945"/>
         <source>Merge trip with trip below</source>
         <translation>Trip met onderstaande samenvoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="948"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="949"/>
         <source>Delete dive(s)</source>
         <translation>Duik(en) verwijderen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="950"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="951"/>
         <source>Mark dive(s) invalid</source>
         <translation>Duik(en) als ongeldig markeren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="954"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="955"/>
         <source>Merge selected dives</source>
         <translation>Geselecteerde duiken samenvoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="956"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
         <source>Renumber dive(s)</source>
         <translation>Duik(en) hernummeren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
         <source>Shift dive times</source>
         <translation>Tijdstip verschuiven</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
         <source>Split selected dives</source>
         <translation>Geselecteerde duiken splitsen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
         <source>Load media from file(s)</source>
         <translation>Laad media van bestand(en)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="961"/>
         <source>Load media from web</source>
         <translation>Laad media van het web</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="986"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="987"/>
         <source>Open media files</source>
         <translation>Open media bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="989"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
         <source>Media files</source>
         <translation>Media bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
         <source>Image files</source>
         <translation>Afbeeldingen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
         <source>Video files</source>
         <translation>Video bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="993"/>
         <source>All files</source>
         <translation>Alle bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="1041"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="1042"/>
         <source>%1 does not appear to be an image</source>
         <translation>%1 lijkt geen afbeelding te zijn</translation>
     </message>
@@ -3553,7 +3553,7 @@ GPS locatie:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="559"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="113"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="115"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="412"/>
         <source>Light</source>
         <translation>Licht</translation>
@@ -3565,157 +3565,157 @@ GPS locatie:</translation>
         <translation>Zandkleurig</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Algemene bestandsindeling die gebruikt wordt om gegevens uit te wisselen tussen verschillende duik programma&apos;s.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Waarden gescheiden door komma&apos;s die het duikprofiel beschrijven.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Waarden gescheiden komma&apos;s met duikinformatie. Deze omvatten een groot deel van de informatie, uitgezonderd het duikprofiel.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Verstuur de duikgegevens naar de divelogs.de website.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
         <source>Send the dive data to dive-share.appspot.com website.</source>
         <translation>Verstuur de duikgegevens naar dive-share.appspot.com.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML export van duiklocaties op een wereldkaart.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface XML bestandsindeling.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
         <source>Subsurface dive sites native XML format.</source>
         <translation>Subsurface duikstekken XML bestandsindeling.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
         <source>Write depths of images to file.</source>
         <translation>Voeg dieptes waarop foto&apos;s genomen zijn toe aan het bestand.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
         <source>Write dive as TeX macros to file.</source>
         <translation>Duik als TeX macro&apos;s naar bestand schrijven.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
         <source>Write dive as LaTeX macros to file.</source>
         <translation>Duik als LaTeX macro&apos;s naar bestand schrijven.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
         <source>Write the profile image as PNG file.</source>
         <translation>Profielafbeelding als PNG bestand schrijven</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="108"/>
         <source>Write profile data to a CSV file.</source>
         <translation>Profielgegevens naar een CSV bestand schrijven</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
         <source>Export UDDF file as</source>
         <translation>Exporteer UDDF bestand als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
         <source>UDDF files</source>
         <translation>UDDF bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/>
         <source>CSV files</source>
         <translation>CSV bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="201"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="203"/>
         <source>HTML files</source>
         <translation>HTML bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="165"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Subsurface files</source>
         <translation>Subsurface bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="175"/>
         <source>Export Subsurface dive sites XML</source>
         <translation>Exporteer Subsurface duikstekken XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>TeX files</source>
         <translation>TeX bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
         <source>Export CSV file as</source>
         <translation>Exporteer CSV bestand als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/>
         <source>Export world map</source>
         <translation>Wereldkaart exporteren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="164"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Export Subsurface XML</source>
         <translation>Exporteer Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="182"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
         <source>Save image depths</source>
         <translation>Bewaar dieptes waarop de foto&apos;s genomen zijn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>Export to TeX file</source>
         <translation>Exporteer naar TeX bestand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Save profile image</source>
         <translation>Profielafbeelding opslaan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="196"/>
         <source>Save profile data</source>
         <translation>Profielgegevens opslaan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="200"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="202"/>
         <source>Export HTML files as</source>
         <translation>Exporteer HTML bestanden als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="214"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="216"/>
         <source>Please wait, exporting...</source>
         <translation>Even geduld, bezig met exporteren...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="249"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="251"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="480"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan het bestand %s niet openen</translation>
     </message>
@@ -4098,62 +4098,62 @@ GPS locatie:</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="171"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="173"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="272"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="274"/>
         <source>cyl.</source>
         <translation>cyl.</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="378"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
         <source>Final depth</source>
         <translation>Eind diepte</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
         <source>Used gas</source>
         <translation>Gebruikt Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="390"/>
         <source>Dive mode</source>
         <translation>Duikmodus</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1026"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1028"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1032"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1034"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1035"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1037"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1082"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1084"/>
         <source>Stop times</source>
         <translation>Stop tijden</translation>
     </message>
@@ -4183,7 +4183,7 @@ GPS locatie:</translation>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="163"/>
         <source>Save new</source>
-        <translation>Bewaar als nieuw bestand</translation>
+        <translation>Opslaan als nieuw bestand</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="268"/>
@@ -4367,12 +4367,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveSiteSortedModel</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="271"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="278"/>
         <source>Delete dive site?</source>
         <translation>Duikstek verwijderen?</translation>
     </message>
     <message numerus="yes">
-        <location filename="../qt-models/divelocationmodel.cpp" line="272"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="279"/>
         <source>This dive site has %n dive(s). Do you really want to delete it?
 </source>
         <translation><numerusform>Deze duikstek heeft %n duik. Wilt u deze werkelijk verwijderen?
@@ -4383,186 +4383,186 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModelBase</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="66"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation>(%1 getoond)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="274"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="314"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="208"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="275"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="315"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="276"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="316"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="277"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="317"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="211"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="278"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="318"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="279"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>Depth(%1)</source>
         <translation>Diepte (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="282"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="322"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="283"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="323"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="217"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="324"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="325"/>
         <source>Temp.(°%1)</source>
         <translation>Temp.(°%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>Weight(%1)</source>
         <translation>Gewicht (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="288"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="328"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="222"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="289"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="329"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="223"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="290"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="330"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="291"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="331"/>
         <source>Cylinder</source>
         <translation>Fles</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="225"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="292"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="332"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="293"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="333"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>SAC(%1)</source>
         <translation>Gasverbruik (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="231"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="296"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="338"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="297"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="234"/>
         <source>Max. CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="300"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="342"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="301"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="343"/>
         <source>Tags</source>
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="237"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="344"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="238"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="345"/>
         <source>Media before/during/after dive</source>
         <translation>Media voor/gedurende/na duik</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="304"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="240"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="305"/>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="241"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="306"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="346"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="242"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="307"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="347"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="243"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="308"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="348"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="309"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="349"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="280"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="281"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="284"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
         <source>Temp.</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="286"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="287"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="294"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="295"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="298"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="340"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="299"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="341"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="302"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="303"/>
         <source>Media</source>
         <translation>Media</translation>
     </message>
@@ -4570,107 +4570,107 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="243"/>
         <source>internal error</source>
         <translation>interne fout</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>Conversie van duik %1 naar divelogs.de formaat is mislukt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="279"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>Fout bij schrijven zip bestand: %s zip fout %d systeem fout %d - %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="526"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="717"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="528"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="719"/>
         <source>Done</source>
         <translation>Klaar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="562"/>
         <source>Uploading dive list...</source>
         <translation>Duiklijst uploaden...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="594"/>
         <source>Downloading dive list...</source>
         <translation>Duiklijst wordt geladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="635"/>
         <source>Downloading %1 dives...</source>
         <translation>%1 duiken worden geladen...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="667"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="669"/>
         <source>Download finished - %1</source>
         <translation>Download klaar - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="681"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="683"/>
         <source>Problem with download</source>
         <translation>Download probleem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="693"/>
         <source>Corrupted download</source>
         <translation>Beschadigde download</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="682"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="692"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="694"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Het archief kon niet geopend worden:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="160"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="491"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="162"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="493"/>
         <source>No dives were selected</source>
         <translation>Geen duiken geselecteerd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="170"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="172"/>
         <source>Stylesheet to export to divelogs.de is not found</source>
         <translation>Stylesheet niet gevonden om naar divelogs.de te exporteren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="180"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="182"/>
         <source>Failed to create zip file for upload: %s</source>
         <translation>Fout bij aanmaken zip bestand voor upload: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="718"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="720"/>
         <source>Upload finished</source>
         <translation>Upload klaar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="731"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/>
         <source>Upload failed</source>
         <translation>Upload mislukt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="734"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/>
         <source>Upload successful</source>
         <translation>Upload gelukt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="737"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="739"/>
         <source>Login failed</source>
         <translation>Login mislukt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="740"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="742"/>
         <source>Cannot parse response</source>
         <translation>Kan antwoord niet correct ontleden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="751"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="753"/>
         <source>Error: %1</source>
         <translation>Fout: %1</translation>
     </message>
@@ -4736,73 +4736,73 @@ Bestaande duikstek</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="86"/>
         <source>Download</source>
         <translation>Downloaden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="90"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Kies Bluetooth download mode</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="177"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="180"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="202"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="205"/>
         <source>Connecting to dive computer</source>
         <translation>Verbinden met duikcomputer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Uemis dive computer</source>
         <translation>Uemis duikcomputer zoeken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Garmin dive computer</source>
         <translation>Garmin duikcomputer zoeken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/>
         <source>Cancel download</source>
         <translation>Download annuleren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="430"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="455"/>
         <source>Choose file for dive computer download logfile</source>
         <translation>Kies een bestand om duikcomputer log te downloaden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="431"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
         <source>Log files</source>
         <translation>Log bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="481"/>
         <source>Choose file for dive computer binary dump file</source>
         <translation>Kies een bestand voor de duikcomputer binaire dump</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="457"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="482"/>
         <source>Dump files</source>
         <translation>Dump bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="485"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="510"/>
         <source>Retry download</source>
         <translation>Opnieuw downloaden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="444"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="469"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="445"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="470"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Duiken worden NIET in de duiklijst geladen als u de libdivecomputer dump opslaat.</translation>
     </message>
@@ -4889,10 +4889,10 @@ Bestaande duikstek</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="303"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="392"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="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="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="334"/>
         <source>Download</source>
         <translation>Downloaden</translation>
@@ -4923,7 +4923,7 @@ Bestaande duikstek</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="340"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
@@ -4939,72 +4939,72 @@ Bestaande duikstek</translation>
         <translation>Bluetooth staat uit</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/>
         <source> Vendor name: </source>
         <translation>Leveranciersnaam:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="97"/>
         <source>USB device</source>
         <translation>USB device</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="105"/>
         <source> Dive Computer:</source>
         <translation>Duikcomputer:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="145"/>
         <source> Connection:</source>
         <translation>Verbinding:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/>
         <source> Previously used dive computers: </source>
         <translation>Voorheen gebruikte duikcomputers:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/>
         <source>Retry</source>
         <translation>Opnieuw</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <source>Quit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="312"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="316"/>
         <source>Rescan</source>
         <translation>Scan opnieuw</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="321"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="325"/>
         <source> Downloaded dives</source>
         <translation>Geladen duiken</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="322"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="326"/>
         <source>Info:</source>
         <translation>Informatie:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="345"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="349"/>
         <source>force downloading all dives</source>
         <translation>forceer downloaden van alle duiken</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="383"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="387"/>
         <source>Accept</source>
         <translation>Aanvaarden</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="403"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="407"/>
         <source>Select All</source>
         <translation>Alles selecteren</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="412"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="416"/>
         <source>Unselect All</source>
         <translation>Selectie ongedaan maken</translation>
     </message>
@@ -5012,7 +5012,7 @@ Bestaande duikstek</translation>
 <context>
     <name>DownloadThread</name>
     <message>
-        <location filename="../core/downloadfromdcthread.cpp" line="101"/>
+        <location filename="../core/downloadfromdcthread.cpp" line="102"/>
         <source>No new dives downloaded from dive computer</source>
         <translation>Geen nieuwe duiken uit duikcomputer geladen</translation>
     </message>
@@ -5020,7 +5020,7 @@ Bestaande duikstek</translation>
 <context>
     <name>EditBuddies</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="602"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="638"/>
         <source>buddies</source>
         <translation>buddy’s</translation>
     </message>
@@ -5028,7 +5028,7 @@ Bestaande duikstek</translation>
 <context>
     <name>EditDiveMaster</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="625"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="661"/>
         <source>dive master</source>
         <translation>duikleider</translation>
     </message>
@@ -5036,15 +5036,23 @@ Bestaande duikstek</translation>
 <context>
     <name>EditMode</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="440"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="454"/>
         <source>dive mode</source>
         <translation>duikmodus</translation>
     </message>
 </context>
 <context>
+    <name>EditNumber</name>
+    <message>
+        <location filename="../desktop-widgets/command_edit.cpp" line="475"/>
+        <source>number</source>
+        <translation>nummer</translation>
+    </message>
+</context>
+<context>
     <name>EditTags</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="570"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="606"/>
         <source>tags</source>
         <translation>trefwoorden</translation>
     </message>
@@ -5052,7 +5060,7 @@ Bestaande duikstek</translation>
 <context>
     <name>EditTagsBase</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="511"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="547"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation><numerusform>Bewerk %1 (%n duik)</numerusform><numerusform>Bewerk %1 (%n duiken)</numerusform></translation>
@@ -5107,129 +5115,134 @@ Bestaande duikstek</translation>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="47"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="41"/>
         <source>Reset / close</source>
         <translation>Reset / sluiten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="57"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="102"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="123"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="140"/>
+        <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>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="64"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="58"/>
         <source>People</source>
         <translation>Personen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="71"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="95"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="147"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="189"/>
+        <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"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="78"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="72"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="85"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="79"/>
         <source>Tags</source>
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="109"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="103"/>
         <source>From</source>
         <translation>Vanaf</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="116"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="110"/>
         <source>To</source>
         <translation>Tot</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="133"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="127"/>
         <source>Visibility</source>
         <translation>Zicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="163"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="157"/>
         <source>Equipment</source>
         <translation>Uitrusting</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="179"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="173"/>
         <source>Water Temp</source>
         <translation>Watertemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="196"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="190"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="203"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="197"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="210"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="204"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="217"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="211"/>
         <source>Air Temp</source>
         <translation>Luchttemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="276"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="270"/>
         <source>Logged</source>
         <translation>Gelogd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="286"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="280"/>
         <source>Planned</source>
         <translation>Gepland</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="330"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="310"/>
+        <source>Close filters</source>
+        <translation>Filters sluiten</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="324"/>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="118"/>
         <source>Reset filters</source>
         <translation>Filters terugzetten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="345"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="364"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="383"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="402"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="421"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="440"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="339"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="358"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="377"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="396"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="415"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="434"/>
         <source>All of</source>
         <translation>Alle van</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="350"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="369"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="388"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="407"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="426"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="445"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="344"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="363"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="382"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="401"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="420"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="439"/>
         <source>Any of</source>
         <translation>Een van</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="355"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="374"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="393"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="412"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="431"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="450"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="349"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="368"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="387"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="406"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="425"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="444"/>
         <source>None of</source>
         <translation>Geen van</translation>
     </message>
@@ -5239,10 +5252,9 @@ Bestaande duikstek</translation>
         <translation>Toon/verberg filters</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="316"/>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="124"/>
         <source>Close and reset filters</source>
-        <translation>Sluit en zet filters terug</translation>
+        <translation>Filters sluiten en terugzetten</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/filterwidget2.cpp" line="245"/>
@@ -5322,12 +5334,12 @@ Bestaande duikstek</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2225"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2227"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2230"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2232"/>
         <source>Firmware update failed!</source>
         <translation>Firmware aanpassing mislukt!</translation>
     </message>
@@ -5343,7 +5355,7 @@ Bestaande duikstek</translation>
 <context>
     <name>GasSelectionModel</name>
     <message>
-        <location filename="../qt-models/models.cpp" line="38"/>
+        <location filename="../qt-models/models.cpp" line="39"/>
         <source>cyl.</source>
         <translation>cyl.</translation>
     </message>
@@ -5387,7 +5399,7 @@ Bestaande duikstek</translation>
 <context>
     <name>GpsLocation</name>
     <message>
-        <location filename="../core/gpslocation.cpp" line="132"/>
+        <location filename="../core/gpslocation.cpp" line="134"/>
         <source>Unknown GPS location (no GPS source)</source>
         <translation>Onbekende GPS locatie (geen GPS bron)</translation>
     </message>
@@ -5453,7 +5465,7 @@ Bestaande duikstek</translation>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="509"/>
         <source>(no existing GPS data, add GPS fix from this dive)</source>
-        <translation>(geen bestaande GPS data, voeg een GPS fix van deze duik toe)</translation>
+        <translation>(geen bestaande GPS gegevens, voeg een GPS fix van deze duik toe)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="511"/>
@@ -5601,9 +5613,9 @@ Bestaande duikstek</translation>
     <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="30"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="504"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="450"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="511"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="512"/>
         <source>Notes</source>
@@ -5629,21 +5641,21 @@ Bestaande duikstek</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="110"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="228"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="224"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="495"/>
         <source>Air temp.</source>
         <translation>Lucht temp.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="120"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="229"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="225"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="496"/>
         <source>Water temp.</source>
         <translation>Water temp.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="195"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="545"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="498"/>
         <source>Location</source>
         <translation>Locatie</translation>
@@ -5686,25 +5698,24 @@ Bestaande duikstek</translation>
         <translation>Zicht</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="343"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="402"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="398"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="509"/>
         <source>Tags</source>
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="412"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="408"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="510"/>
         <source>Dive mode</source>
         <translation>Duikmodus</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="62"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="513"/>
         <source>Equipment</source>
         <translation>Uitrusting</translation>
@@ -5722,93 +5733,93 @@ Bestaande duikstek</translation>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="70"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/>
         <source>Extra Info</source>
         <translation>Extra Informatie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="64"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
         <source>Information</source>
         <translation>Informatie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="66"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="65"/>
         <source>Statistics</source>
         <translation>Statistieken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="68"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="67"/>
         <source>Media</source>
         <translation>Media</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="71"/>
         <source>Dive sites</source>
         <translation>Duikstekken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="91"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="90"/>
         <source>Apply changes</source>
         <translation>Wijzigingen toepassen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="95"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="94"/>
         <source>Discard changes</source>
         <translation>Wijzigingen verwijderen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="99"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/>
         <source>Undo</source>
         <translation>Ongedaan maken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="731"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="735"/>
         <source>Warning: edited %1 dives</source>
         <translation>Waarschuwing: %1 duiken bewerkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="225"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="221"/>
         <source>Air temp. [%1]</source>
         <translation>Lucht temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="226"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="222"/>
         <source>Water temp. [%1]</source>
         <translation>Water temp. [%1]</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="264"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="260"/>
         <source>Multiple dives are being edited.</source>
         <translation>Meerdere duiken worden bewerkt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="266"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="262"/>
         <source>This dive is being edited.</source>
         <translation>Deze duik wordt bewerkt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="494"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="458"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/>
         <source>Trip notes</source>
         <translation>Trip notities</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="489"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="491"/>
         <source>Trip location</source>
         <translation>Trip locatie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="686"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="690"/>
         <source>Discard the changes?</source>
         <translation>Wijzigingen niet opslaan?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="687"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="691"/>
         <source>You are about to discard your changes.</source>
         <translation>U staat op het punt wijzigingen te verwijderen</translation>
     </message>
@@ -5819,7 +5830,7 @@ Bestaande duikstek</translation>
         <location filename="../desktop-widgets/mainwindow.ui" line="67"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="614"/>
         <source>&amp;File</source>
-        <translation>Bestand</translation>
+        <translation>&amp;Bestand</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="88"/>
@@ -5876,7 +5887,7 @@ Bestaande duikstek</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="494"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="535"/>
         <source>Open</source>
         <translation>Open</translation>
@@ -6295,45 +6306,45 @@ Bestaande duikstek</translation>
         <translation>Cloud opslag online</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="485"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="532"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1514"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="486"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="533"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1530"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Bewaar of maak de huidige wijziging ongedaan voor u een nieuw bestand opent.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="491"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
         <source>Open file</source>
         <translation>Bestand openen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="691"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="655"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
+        <location filename="../desktop-widgets/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"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="692"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="693"/>
         <source>Trying to merge dives with %1min interval in between</source>
         <translation>Je probeert duiken samen te voegen met een %1min oppervlakteinterval</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="256"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
         <source>Template backup created</source>
         <translation>Template backup aangemaakt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="258"/>
         <source>The following backup printing templates were created:
 
 %1
@@ -6356,231 +6367,231 @@ alleen leesbaar zijn, en deze dienen niet gewerkt te worden, want de
 applicatie kan deze overschrijven bij opnieuw opstarten.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="607"/>
         <source>Please save or cancel the current dive edit before going online</source>
         <translation>Bewaar of maak de huidige wijziging ongedaan voor u online gaat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="620"/>
         <source>You have unsaved changes. Do you want to commit them to the cloud storage?
 If answering no, the cloud will only be synced on next call to &quot;Open cloud storage&quot; or &quot;Save to cloud storage&quot;.</source>
         <translation>Er zijn niet bewaarde wijzigingen. Wilt u deze opslaan in de cloud opslag?
 Bij antwoord nee, zal de cloud pas gesynchroniseerd worden bij de eerstvolgende &quot;Open cloud opslag&quot; of &quot;Opslaan in cloud opslag&quot;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="629"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="630"/>
         <source>Failure taking cloud storage online</source>
         <translation>Cloud opslag online gaan is mislukt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="703"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Bewaar of maak de huidige wijziging ongedaan voor U het bestand sluit.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="806"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Bewaar of maak de huidige wijziging ongedaan voor U een duik toevoegt.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="857"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="858"/>
         <source>Print runtime table</source>
         <translation>Runtime tabel afdrukken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="914"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>U probeert een duik te herplannen die geen geplande duik is.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1669"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1772"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>multiple files</source>
         <translation>meerdere bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1750"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1766"/>
         <source>Open dive site file</source>
         <translation>Duikstek bestand openen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Rond de huidige wijziging af vooraleer een volgende te beginnen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1016"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1017"/>
         <source>Yearly statistics</source>
         <translation>Jaarlijkse statistieken</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1284"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/>
         <source>Dive log files</source>
         <translation>Duiklog bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1263"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1543"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1559"/>
         <source>Subsurface files</source>
         <translation>Subsurface bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
         <source>Cochran</source>
         <translation>Cochran</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
         <source>DiveLogs.de</source>
         <translation>DiveLogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
         <source>JDiveLog</source>
         <translation>JDiveLog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
         <source>Liquivision</source>
         <translation>Liquivision</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
         <source>Suunto</source>
         <translation>Suunto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
         <source>UDCF</source>
         <translation>UDCF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
         <source>UDDF</source>
         <translation>UDDF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
         <source>XML</source>
         <translation>XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
         <source>Divesoft</source>
         <translation>Divesoft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
         <source>Datatrak/WLog</source>
         <translation>Datatrak/WLog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
         <source>MkVI files</source>
         <translation>MkVI bestanden</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="1276"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
         <source>APD log viewer</source>
         <translation>APD log viewer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1276"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
         <source>OSTCtools</source>
         <translation>OSTCtools</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
         <source>DAN DL7</source>
         <translation>DAN DL7</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
         <source>CSV</source>
         <translation>CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/>
         <source>All files</source>
         <translation>Alle bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/>
         <source>Dive site files</source>
         <translation>Duikstek bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Wilt u de wijzigingen in bestand %1 opslaan?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Wilt u de wijzigingen opslaan in het bestand?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="618"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1349"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
         <source>Save changes?</source>
         <translation>Aanpassingen opslaan?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Wijzigingen gaan verloren als u deze niet bewaart.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1542"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1558"/>
         <source>Save file as</source>
         <translation>Bestand opslaan als</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1630"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1646"/>
         <source>[local cache for] %1</source>
         <translation>[lokale cache voor] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1631"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1647"/>
         <source>[cloud storage for] %1</source>
         <translation>[cloud opslag voor] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1698"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/>
         <source>Opening datafile from older version</source>
         <translation>Opent een databestand van een oudere versie</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1699"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>U heeft een databestand van een oudere versie van Subsurface geopend. Wij raden u aan de handleiding te lezen met betrekking tot de nieuwe versie, in het bijzonder de sterk veranderde duikstek-afhandeling.
 Subsurface heeft reeds gesprobeerd de data te converteren, maar het is nuttig zelf vast te stellen dat de conversie correct is verlopen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1723"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1739"/>
         <source>Open dive log file</source>
         <translation>Open duiklogboek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Contacting cloud service...</source>
         <translation>Contact opnemen met cloud service...</translation>
     </message>
@@ -6703,7 +6714,7 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
 <context>
     <name>PasteDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="728"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="760"/>
         <source>Paste onto %n dive(s)</source>
         <translation><numerusform>In %n duik plakken</numerusform><numerusform>In %n duiken plakken</numerusform></translation>
     </message>
@@ -6936,22 +6947,32 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <translation>Zet alle instellingen terug naar hun standaardwaarde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="14"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Open default log file</source>
         <translation>Standaard logboek openen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Subsurface files</source>
         <translation>Subsurface bestanden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
+        <source>Warning</source>
+        <translation>Waarschuwing</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>Kan ffmpeg niet uitvoeren vanaf de opgegeven locatie: Thumbnails worden niet gemaakt </translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="70"/>
         <source>Select ffmpeg executable</source>
         <translation>Selecteer ffmpeg executable</translation>
     </message>
@@ -6961,7 +6982,7 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
     <message>
         <location filename="../desktop-widgets/preferences/preferencesdialog.cpp" line="42"/>
         <source>Preferences</source>
-        <translation>Instellingen</translation>
+        <translation>Voorkeuren</translation>
     </message>
 </context>
 <context>
@@ -7199,7 +7220,7 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l
         <translation>Toon gemiddelde diepte in profiel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="12"/>
         <source>Profile</source>
         <translation>Profiel</translation>
     </message>
@@ -7839,17 +7860,17 @@ Exporteer naar een ander bestand.</translation>
         <translation>Onbekende duikcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="840"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="837"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>NDL / TTS wordt niet getoond omdat de berekening te lang duurt</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1451"/>
         <source>Add gas change</source>
         <translation>Gaswissel toevoegen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1435"/>
         <source>Make first dive computer</source>
         <translation>Maak eerste duikcomputer</translation>
     </message>
@@ -7864,103 +7885,103 @@ Exporteer naar een ander bestand.</translation>
         <translation>Handmatig toegevoegde duik</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1440"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
         <source>Delete this dive computer</source>
         <translation>Verwijder deze duikcomputer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1441"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Split this dive computer into own dive</source>
         <translation>Deze duikcomputer naar eigen duik splitsen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1457"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
         <source> (cyl. %1)</source>
         <translation> (fles %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1463"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
         <source>Add setpoint change</source>
         <translation>Voeg setpoint wissel toe</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1465"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1462"/>
         <source>Add bookmark</source>
         <translation>Bladwijzer toevoegen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1467"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1464"/>
         <source>Split dive into two</source>
         <translation>Duik in tweeën splitsen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1477"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
         <source>Change divemode</source>
         <translation>Duikmodus wijzigen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1501"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1498"/>
         <source>Edit the profile</source>
         <translation>Profiel bewerken</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1505"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1502"/>
         <source>Remove event</source>
         <translation>Gebeurtenis verwijderen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1507"/>
         <source>Hide similar events</source>
         <translation>Gelijkaardige gebeurtenissen verbergen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1517"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
         <source>Edit name</source>
         <translation>Naam bewerken</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1548"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1555"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1545"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1552"/>
         <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source>
         <translation>Druk aanpassen van cilinder %1 (nu geïnterpoleerd als %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1570"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1567"/>
         <source>Unhide all events</source>
         <translation>Toon alle gebeurtenissen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide events</source>
         <translation>Gebeurtenissen verbergen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide all %1 events?</source>
         <translation>Alle %1 gebeurtenissen verbergen?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1630"/>
         <source>Remove the selected event?</source>
         <translation>Geselecteerde gebeurtenis verwijderen?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1631"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1786"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1783"/>
         <source>Edit name of bookmark</source>
         <translation>Naam bladwijzer bewerken</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1787"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1784"/>
         <source>Custom name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1792"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1789"/>
         <source>Name is too long!</source>
         <translation>Deze naam is te lang!</translation>
     </message>
@@ -7968,147 +7989,152 @@ Exporteer naar een ander bestand.</translation>
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="206"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="207"/>
         <source>Starting...</source>
         <translation>Starten...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="275"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/>
         <source>Open local dive data file</source>
         <translation>Open lokale duikgegevens</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="283"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Opening local data file failed</source>
         <translation>Open lokale duikgegevens mislukt</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/>
         <source>%1 dives loaded from local dive data file</source>
         <translation>%1 duiken geladen uit de lokale duikgegevens</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/>
         <source>working in no-cloud mode</source>
         <translation>werkt met lokale data</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="425"/>
         <source>Error parsing local storage, giving up</source>
         <translation>Fout bij het verwerken van de lokale opslag, opgegeven</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="427"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="434"/>
         <source>no cloud credentials</source>
         <translation>Geen cloud rechten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="428"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="504"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>Voer geldige cloud rechten in</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="473"/>
         <source>Invalid format for email address</source>
         <translation>Ongeldig formaat voor e-mailadres</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>Probeert cloud opslag te openen met nieuwe rechten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="544"/>
         <source>Testing cloud credentials</source>
         <translation>Cloud rechten worden gecontroleerd</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="552"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="559"/>
         <source>No response from cloud server to validate the credentials</source>
         <translation>Geen antwoord van de cloud server bij het valideren van de inlogrechten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="567"/>
         <source>Incorrect cloud credentials</source>
         <translation>Onjuiste cloud rechten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="566"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation>Kan niet verbinden met de Subsurface cloud opslag - cloud account niet geverifieerd</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="593"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="600"/>
         <source>Cloud credentials are invalid</source>
         <translation>Cloud rechten zijn ongeldig</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="607"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>Kan cloud opslag niet openen: Fout bij aanmaken https verbinding</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="628"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>Kan cloud opslag niet openen: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="634"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="641"/>
         <source>Cannot connect to cloud storage</source>
         <translation>Kan niet verbinden met de Subsurface cloud opslag</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="646"/>
         <source>Cloud credentials valid, loading dives...</source>
         <translation>Cloud rechten zijn geldig. duiken ophalen...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="649"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="656"/>
         <source>Cloud storage error: %1</source>
         <translation>Cloud opslag fout: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="695"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="702"/>
         <source>Loading dives from local storage (&apos;no cloud&apos; mode)</source>
         <translation>Duiken laden uit de lokale opslag (&apos;no cloud&apos; mode)</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="748"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>
 Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="766"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>Cloud opslag succesvol geopend. Geen duiken in de duiklijst.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="942"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="953"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1479"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1048"/>
+        <source>weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1493"/>
         <source>Unknown GPS location</source>
         <translation>Onbekende GPS locatie</translation>
     </message>
@@ -8124,15 +8150,15 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2151"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2153"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2148"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2131"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2139"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2150"/>
         <source>Failed!</source>
         <translation>Mislukt!</translation>
     </message>
@@ -8153,23 +8179,23 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="138"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="139"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="90"/>
         <source>New starting number</source>
         <translation>Nieuw beginnummer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="136"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="137"/>
         <source>New number</source>
         <translation>Nieuw nummer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="141"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
         <source>Renumber selected dives</source>
         <translation>Geselecteerde duiken hernummeren</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="143"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="144"/>
         <source>Renumber all dives</source>
         <translation>Alle duiken hernummeren</translation>
     </message>
@@ -8177,7 +8203,7 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2248"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2250"/>
         <source>Reset settings failed!</source>
         <translation>Terugzetten instellingen mislukt!</translation>
     </message>
@@ -8488,39 +8514,39 @@ Niet alle media bestanden hebben tijdstippen tussen 30 minuten voor de start en
         <translation>Welke datum en tijd worden weergegeven in de afbeelding?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="284"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="285"/>
         <source>Open image file</source>
         <translation>Afbeelding openen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="286"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="287"/>
         <source>Image files</source>
         <translation>Afbeeldingen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="367"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="368"/>
         <source>Selected dive date/time</source>
         <translation>Geselecteerde duik datum/tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="369"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
         <source>First selected dive date/time</source>
         <translation>Eerste geselecteerde duik datum/tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="371"/>
         <source>Last selected dive date/time</source>
         <translation>Laatste geselecteerde duik datum/tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="372"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/>
         <source>
 Files with inappropriate date/time</source>
         <translation>
 Bestanden met onjuiste datum/tijd</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="382"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="383"/>
         <source>No Exif date/time found</source>
         <translation>Geen Exif daum/tijd gevonden</translation>
     </message>
@@ -8622,28 +8648,28 @@ Bestanden met onjuiste datum/tijd</translation>
         <translation>Importeer berichten (fouten, waarschuwingen, etc)</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
         <source>Open SmartTrak files</source>
         <translation>Open SmartTrak bestanden</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
         <source>SmartTrak files</source>
         <translation>SmartTrak bestanden</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>All files</source>
         <translation>Alle bestanden</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>Subsurface files</source>
         <translation>Subsurface bestanden</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
         <source>Open Subsurface files</source>
         <translation>Open Subsurface bestanden</translation>
     </message>
@@ -8707,25 +8733,45 @@ Bestanden met onjuiste datum/tijd</translation>
         <translation>Uitrusting</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="48"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.ui" line="74"/>
+        <source>Suit</source>
+        <translation>Pak</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
         <source>Cylinders</source>
         <translation>Flessen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="49"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
         <source>Add cylinder</source>
         <translation>Fles toevoegen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="56"/>
         <source>Weights</source>
         <translation>Gewichten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/>
         <source>Add weight system</source>
         <translation>Gewichtssysteem toevoegen</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="60"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="64"/>
+        <source>Undo</source>
+        <translation>Ongedaan maken</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="306"/>
+        <source>Warning: edited %1 dives</source>
+        <translation>Waarschuwing: %1 duiken bewerkt</translation>
+    </message>
 </context>
 <context>
     <name>TabDiveExtraInfo</name>
@@ -8833,29 +8879,29 @@ Bestanden met onjuiste datum/tijd</translation>
         <translation>Soort water</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="75"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="76"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>d</source>
         <translation>d</translation>
     </message>
@@ -9346,7 +9392,7 @@ worden uit lucht en:
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/>
         <source>%1click to visit %2</source>
         <translation>%1klik om te bezoeken %2</translation>
     </message>
@@ -9497,7 +9543,7 @@ Als je dit niet wilt, selecteer Weiger.</translation>
         <location filename="../desktop-widgets/usersurvey.ui" line="20"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="193"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We zouden graag meer weten over onze gebruikers, hun voorkeuren en hun gewoontes. Neem a.u.b. even de tijd om dit formulier in te vullen en het naar het Subsurface team te verzenden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We zouden graag meer te weten komen over onze gebruikers, hun voorkeuren en hun gewoontes. Neem alstublieft even de tijd om dit formulier in te vullen en het naar het Subsurface-team te verzenden.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="47"/>
@@ -9653,13 +9699,13 @@ Taal: %1</translation>
     <name>VideoFrameExtractor</name>
     <message>
         <location filename="../core/videoframeextractor.cpp" line="93"/>
-        <source>ffmpeg failed to start - video thumbnail creation suspended</source>
-        <translation>opstarten ffmpeg mislukt - aanmaken video thumbnail gestaakt</translation>
+        <source>ffmpeg failed to start - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
+        <translation>ffmpeg kon niet worden gestart - maken van video thumbnails is uitgesteld. Om video thumbnails in te schakelen, stel de executable in bij de voorkeuren.</translation>
     </message>
     <message>
-        <location filename="../core/videoframeextractor.cpp" line="99"/>
-        <source>failed waiting for ffmpeg - video thumbnail creation suspended</source>
-        <translation>wacht op ffmpeg gefaald - aanmaken video thumbnail gestaakt</translation>
+        <location filename="../core/videoframeextractor.cpp" line="97"/>
+        <source>Failed waiting for ffmpeg - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
+        <translation>Wachten op ffmpeg mislukt - maken van video thumbnails is uitgesteld. Om video thumbnails in te schakelen, stel de executable in bij de voorkeuren.</translation>
     </message>
 </context>
 <context>
@@ -9726,12 +9772,12 @@ Taal: %1</translation>
         <translation>Uploaden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="331"/>
         <source>Operation timed out</source>
-        <translation>Operatie duurt te lang</translation>
+        <translation>Bewerking duurde te lang</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="352"/>
         <source>Transferring data...</source>
         <translation>Gegevens worden overgebracht...</translation>
     </message>
@@ -9749,7 +9795,7 @@ Taal: %1</translation>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-models/weightmodel.cpp" line="72"/>
+        <location filename="../qt-models/weightmodel.cpp" line="71"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Klik hier om dit gewichtssysteem te verwijderen.</translation>
     </message>
@@ -9757,15 +9803,15 @@ Taal: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2198"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2200"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Deze functie is nog niet beschikbaar voor de geselecteerde duikcomputer.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2195"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2179"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2189"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2197"/>
         <source>Failed!</source>
         <translation>Mislukt!</translation>
     </message>
@@ -9886,7 +9932,7 @@ Maximum</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="801"/>
+        <location filename="../core/libdivecomputer.c" line="802"/>
         <source>Error parsing the header</source>
         <translation>Fout bij het verwerken van de header</translation>
     </message>
@@ -9897,7 +9943,7 @@ Maximum</translation>
         <location filename="../core/cochran.c" line="306"/>
         <location filename="../core/cochran.c" line="312"/>
         <location filename="../core/cochran.c" line="382"/>
-        <location filename="../core/libdivecomputer.c" line="244"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deco stop</source>
         <translation>decompressiestop</translation>
     </message>
@@ -9905,7 +9951,7 @@ Maximum</translation>
         <location filename="../core/cochran.c" line="333"/>
         <location filename="../core/cochran.c" line="387"/>
         <location filename="../core/import-csv.c" line="680"/>
-        <location filename="../core/libdivecomputer.c" line="246"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>ascent</source>
         <translation>opstijging</translation>
     </message>
@@ -9917,20 +9963,20 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="345"/>
-        <location filename="../core/libdivecomputer.c" line="262"/>
+        <location filename="../core/libdivecomputer.c" line="263"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="350"/>
-        <location filename="../core/libdivecomputer.c" line="261"/>
+        <location filename="../core/libdivecomputer.c" line="262"/>
         <source>maxdepth</source>
         <translation>Max. diepte</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="355"/>
         <location filename="../core/cochran.c" line="401"/>
-        <location filename="../core/libdivecomputer.c" line="263"/>
+        <location filename="../core/libdivecomputer.c" line="264"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
@@ -9939,8 +9985,8 @@ Maximum</translation>
         <location filename="../core/cochran.c" line="411"/>
         <location filename="../core/cochran.c" line="418"/>
         <location filename="../core/import-csv.c" line="761"/>
-        <location filename="../core/libdivecomputer.c" line="254"/>
-        <location filename="../core/libdivecomputer.c" line="268"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="269"/>
         <location filename="../core/plannernotes.c" line="54"/>
         <source>gaschange</source>
         <translation>gaswissel</translation>
@@ -9948,101 +9994,101 @@ Maximum</translation>
     <message>
         <location filename="../core/cochran.c" line="367"/>
         <location filename="../core/cochran.c" line="406"/>
-        <location filename="../core/libdivecomputer.c" line="245"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>rbt</source>
         <translation>RBT</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="376"/>
         <location filename="../core/cochran.c" line="423"/>
-        <location filename="../core/libdivecomputer.c" line="247"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>ceiling</source>
         <translation>plafond</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="392"/>
-        <location filename="../core/libdivecomputer.c" line="249"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>transmitter</source>
         <translation>zender</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="255"/>
+        <location filename="../core/datatrak.c" line="256"/>
         <source>clear</source>
         <translation>helder</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="258"/>
+        <location filename="../core/datatrak.c" line="259"/>
         <source>misty</source>
         <translation>heiig</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="261"/>
+        <location filename="../core/datatrak.c" line="262"/>
         <source>fog</source>
         <translation>mist</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="264"/>
+        <location filename="../core/datatrak.c" line="265"/>
         <source>rain</source>
         <translation>regen</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="267"/>
+        <location filename="../core/datatrak.c" line="268"/>
         <source>storm</source>
         <translation>storm</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="270"/>
+        <location filename="../core/datatrak.c" line="271"/>
         <source>snow</source>
         <translation>sneeuw</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="290"/>
+        <location filename="../core/datatrak.c" line="291"/>
         <source>No suit</source>
         <translation>Geen pak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="293"/>
+        <location filename="../core/datatrak.c" line="294"/>
         <source>Shorty</source>
         <translation>Shorty</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="296"/>
+        <location filename="../core/datatrak.c" line="297"/>
         <source>Combi</source>
         <translation>Combinatie natpak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="299"/>
+        <location filename="../core/datatrak.c" line="300"/>
         <source>Wet suit</source>
         <translation>Natpak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="302"/>
+        <location filename="../core/datatrak.c" line="303"/>
         <source>Semidry suit</source>
         <translation>Semi-natpak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="305"/>
+        <location filename="../core/datatrak.c" line="306"/>
         <source>Dry suit</source>
         <translation>Droogpak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="364"/>
+        <location filename="../core/datatrak.c" line="365"/>
         <source>no stop</source>
         <translation>geen stop</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="366"/>
+        <location filename="../core/datatrak.c" line="367"/>
         <location filename="../core/tag.c" line="20"/>
         <source>deco</source>
         <translation>decompressie</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="368"/>
+        <location filename="../core/datatrak.c" line="369"/>
         <source>single ascent</source>
         <translation>enkele opstijging</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="370"/>
+        <location filename="../core/datatrak.c" line="371"/>
         <source>multiple ascent</source>
         <translation>meerdere opstijgingen</translation>
     </message>
@@ -10052,117 +10098,117 @@ Maximum</translation>
         <translation>zoet</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="372"/>
+        <location filename="../core/datatrak.c" line="373"/>
         <source>fresh water</source>
         <translation>zoet water</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="374"/>
+        <location filename="../core/datatrak.c" line="375"/>
         <source>salt water</source>
         <translation>zout water</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="395"/>
+        <location filename="../core/datatrak.c" line="396"/>
         <source>sight seeing</source>
         <translation>rondkijken</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="397"/>
+        <location filename="../core/datatrak.c" line="398"/>
         <source>club dive</source>
         <translation>club duik</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="399"/>
+        <location filename="../core/datatrak.c" line="400"/>
         <location filename="../core/tag.c" line="19"/>
         <source>instructor</source>
         <translation>instructeur</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="401"/>
+        <location filename="../core/datatrak.c" line="402"/>
         <source>instruction</source>
         <translation>instructie</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="403"/>
+        <location filename="../core/datatrak.c" line="404"/>
         <location filename="../core/tag.c" line="18"/>
         <source>night</source>
         <translation>nacht</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="405"/>
+        <location filename="../core/datatrak.c" line="406"/>
         <location filename="../core/tag.c" line="16"/>
         <source>cave</source>
         <translation>grot</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="407"/>
+        <location filename="../core/datatrak.c" line="408"/>
         <location filename="../core/tag.c" line="15"/>
         <source>ice</source>
         <translation>ijs</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="409"/>
+        <location filename="../core/datatrak.c" line="410"/>
         <source>search</source>
         <translation>zoeken</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="416"/>
+        <location filename="../core/datatrak.c" line="417"/>
         <location filename="../core/tag.c" line="16"/>
         <source>wreck</source>
         <translation>wrak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="418"/>
+        <location filename="../core/datatrak.c" line="419"/>
         <location filename="../core/tag.c" line="17"/>
         <source>river</source>
         <translation>rivier</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="420"/>
+        <location filename="../core/datatrak.c" line="421"/>
         <location filename="../core/tag.c" line="14"/>
         <source>drift</source>
         <translation>drift</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="422"/>
+        <location filename="../core/datatrak.c" line="423"/>
         <location filename="../core/tag.c" line="19"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="424"/>
+        <location filename="../core/datatrak.c" line="425"/>
         <source>other</source>
         <translation>andere</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="434"/>
+        <location filename="../core/datatrak.c" line="435"/>
         <source>Other activities</source>
         <translation>Andere activiteiten</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="458"/>
+        <location filename="../core/datatrak.c" line="459"/>
         <source>Datatrak/Wlog notes</source>
         <translation>Datatrak/Wlog notities</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="502"/>
+        <location filename="../core/datatrak.c" line="503"/>
         <source>[Warning] Manual dive # %d
 </source>
         <translation>[Waarschuwing] Handmatige duik # %d
 </translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="528"/>
+        <location filename="../core/datatrak.c" line="529"/>
         <source>[Error] Out of memory for dive %d. Abort parsing.</source>
         <translation>[Fout] Geen geheugen over bij duik %d. Stop verwerking.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="576"/>
+        <location filename="../core/datatrak.c" line="577"/>
         <source>[Error] File is not a DataTrak file. Aborted</source>
         <translation>[Fout] Bestand is geen DataTrak bestand. Gestopt.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="589"/>
+        <location filename="../core/datatrak.c" line="590"/>
         <source>Error: no dive</source>
         <translation>Fout: geen duik</translation>
     </message>
@@ -10212,30 +10258,30 @@ Maximum</translation>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>OC-gas</source>
         <translation>OC-gas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>diluent</source>
         <translation>diluent</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../core/equipment.c" line="92"/>
-        <location filename="../core/planner.c" line="1158"/>
-        <location filename="../core/planner.c" line="1161"/>
+        <location filename="../core/equipment.c" line="45"/>
+        <location filename="../core/equipment.c" line="144"/>
+        <location filename="../core/planner.c" line="1179"/>
+        <location filename="../core/planner.c" line="1182"/>
         <source>oxygen</source>
         <translation>zuurstof</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>not used</source>
         <translation>niet gebruikt</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="32"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>Open circuit</source>
         <translation>Open circuit</translation>
     </message>
@@ -10248,17 +10294,17 @@ Maximum</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="622"/>
-        <location filename="../core/qthelper.cpp" line="814"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
+        <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="625"/>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1251"/>
+        <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>
@@ -10269,25 +10315,25 @@ Maximum</translation>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1275"/>
+        <location filename="../core/qthelper.cpp" line="1277"/>
         <location filename="../core/units.c" line="65"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="538"/>
-        <location filename="../core/qthelper.cpp" line="553"/>
-        <location filename="../core/qthelper.cpp" line="732"/>
-        <location filename="../core/qthelper.cpp" line="1227"/>
+        <location filename="../core/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="541"/>
-        <location filename="../core/qthelper.cpp" line="555"/>
-        <location filename="../core/qthelper.cpp" line="734"/>
-        <location filename="../core/qthelper.cpp" line="1226"/>
+        <location filename="../core/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>
@@ -10313,86 +10359,86 @@ Maximum</translation>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="564"/>
-        <location filename="../core/qthelper.cpp" line="574"/>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <location filename="../core/qthelper.cpp" line="1203"/>
+        <location filename="../core/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="132"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="133"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="562"/>
-        <location filename="../core/qthelper.cpp" line="572"/>
-        <location filename="../core/qthelper.cpp" line="787"/>
-        <location filename="../core/qthelper.cpp" line="1202"/>
+        <location filename="../core/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="130"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="131"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="678"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1154"/>
-        <location filename="../core/planner.c" line="1157"/>
+        <location filename="../core/divelist.c" line="648"/>
+        <location filename="../core/equipment.c" line="140"/>
+        <location filename="../core/planner.c" line="1175"/>
+        <location filename="../core/planner.c" line="1178"/>
         <source>air</source>
         <translation>lucht</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="90"/>
+        <location filename="../core/equipment.c" line="142"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="205"/>
+        <location filename="../core/equipment.c" line="252"/>
         <source>integrated</source>
         <translation>Geïntegreerd</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="206"/>
+        <location filename="../core/equipment.c" line="253"/>
         <source>belt</source>
         <translation>riem</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="207"/>
+        <location filename="../core/equipment.c" line="254"/>
         <source>ankle</source>
         <translation>enkel</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="208"/>
+        <location filename="../core/equipment.c" line="255"/>
         <source>backplate</source>
         <translation>backplate</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="209"/>
+        <location filename="../core/equipment.c" line="256"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="116"/>
+        <location filename="../core/file.c" line="117"/>
         <source>No dives in the input file &apos;%s&apos;</source>
         <translation>Geen duiken in het invoer bestand &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="334"/>
+        <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="53"/>
+        <location filename="../core/ostctools.c" line="54"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Fout bij lezen van &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="221"/>
+        <location filename="../core/file.c" line="222"/>
         <source>Cannot open CSV file %s; please use Import log file dialog</source>
         <comment>'Import log file' should be the same text as corresponding label in Import menu</comment>
         <translation>CSV bestand %s kan niet geopend worden; gebruik het Importeer logbestanden menu</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="336"/>
+        <location filename="../core/file.c" line="337"/>
         <source>Empty file &apos;%s&apos;</source>
         <translation>Leeg bestand &apos;%s&apos;</translation>
     </message>
@@ -10443,287 +10489,287 @@ Maximum</translation>
         <translation>Geen duikprofiel voor &apos;%s&apos; gevonden</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="83"/>
+        <location filename="../core/git-access.c" line="85"/>
         <source>Checkout from storage (%lu/%lu)</source>
         <translation>Checkout uit opslag (%lu/%lu)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="114"/>
+        <location filename="../core/git-access.c" line="116"/>
         <source>Transfer from storage (%d/%d)</source>
         <translation>Ophalen uit opslag (%d/%d)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="126"/>
+        <location filename="../core/git-access.c" line="128"/>
         <source>Transfer to storage (%d/%d)</source>
         <translation>Verplaatsen naar opslag (%d/%d)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="162"/>
+        <location filename="../core/git-access.c" line="164"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation>Lokale cache map %s is corrupt - kan niet synchroniseren met de Subsurface cloud opslag</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="185"/>
-        <location filename="../core/git-access.c" line="205"/>
+        <location filename="../core/git-access.c" line="187"/>
+        <location filename="../core/git-access.c" line="207"/>
         <source>Could not update local cache to newer remote data</source>
         <translation>Kan de lokale cache niet aanpassen naar nieuwere data in de Sursurface cloud</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="198"/>
+        <location filename="../core/git-access.c" line="200"/>
         <source>Subsurface cloud storage corrupted</source>
         <translation>Subsurface cloud opslag corrupt</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="334"/>
+        <location filename="../core/git-access.c" line="336"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
         <translation>Kan de Subsurface cloud opslag niet actualiseren, probeer later opnieuw</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="394"/>
+        <location filename="../core/git-access.c" line="396"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
         <translation>Cloud en lokale data verschillen teveel. Fout: samenvoegen mislukt (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="424"/>
+        <location filename="../core/git-access.c" line="426"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
         <translation>Cloud en lokale data verschillen teveel. Kan de verschillen niet samenvoegen</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="458"/>
+        <location filename="../core/git-access.c" line="460"/>
         <source>Remote storage and local data diverged</source>
         <translation>Cloud en lokale data verschillen teveel.</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="461"/>
+        <location filename="../core/git-access.c" line="463"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
         <translation>Cloud en lokale data verschillen teveel. Fout: wegschrijven data mislukt (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="470"/>
+        <location filename="../core/git-access.c" line="472"/>
         <source>Problems with local cache of Subsurface cloud data</source>
         <translation>Problemen met lokale cache van de Subsurface cloud data</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="471"/>
+        <location filename="../core/git-access.c" line="473"/>
         <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation>Cache data verplaatst naar %s. Probeer de operatie opnieuw.</translation>
+        <translation>Cache data verplaatst naar %s. Probeer de bewerking opnieuw.</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="518"/>
+        <location filename="../core/git-access.c" line="520"/>
         <source>Update local storage to match cloud storage</source>
         <translation>Lokale opslag synchroniseren met cloud opslag</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="526"/>
+        <location filename="../core/git-access.c" line="528"/>
         <source>Push local changes to cloud storage</source>
         <translation>Lokale wijzigingen naar cloud opslag verplaatsen</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="544"/>
+        <location filename="../core/git-access.c" line="546"/>
         <source>Try to merge local changes into cloud storage</source>
         <translation>Probeer lokale wijzigingen in cloud opslag samen te voegen</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="586"/>
+        <location filename="../core/git-access.c" line="588"/>
         <source>Store data into cloud storage</source>
         <translation>Data in cloud opslag oplaan</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="610"/>
+        <location filename="../core/git-access.c" line="612"/>
         <source>Sync with cloud storage</source>
         <translation>Synchroniseren met cloud opslag</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="637"/>
+        <location filename="../core/git-access.c" line="639"/>
         <source>Can&apos;t reach cloud server, working with local data</source>
         <translation>Kan cloud server niet bereiken, werken met lokale data</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="650"/>
+        <location filename="../core/git-access.c" line="652"/>
         <source>Successful cloud connection, fetch remote</source>
         <translation>Verbinden met cloud gelukt, wijzigingen ophalen</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="669"/>
+        <location filename="../core/git-access.c" line="671"/>
         <source>Done syncing with cloud storage</source>
         <translation>Synchroniseren met cloud gereed</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="804"/>
+        <location filename="../core/git-access.c" line="806"/>
         <source>Error connecting to Subsurface cloud storage</source>
         <translation>Kan niet verbinden met de Subsurface cloud opslag</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="807"/>
+        <location filename="../core/git-access.c" line="809"/>
         <source>git clone of %s failed (%s)</source>
         <translation>git clone van %s mislukt (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="833"/>
+        <location filename="../core/git-access.c" line="835"/>
         <source>Synchronising data file</source>
-        <translation>Data bestand synchroniseren</translation>
+        <translation>Gegevensbestand synchroniseren</translation>
     </message>
     <message>
-        <location filename="../core/import-divinglog.c" line="315"/>
-        <location filename="../core/libdivecomputer.c" line="230"/>
+        <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/uemis-downloader.c" line="197"/>
+        <location filename="../core/uemis-downloader.c" line="199"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="243"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>none</source>
         <translation>geen</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="248"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>workload</source>
         <translation>werklast</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="250"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>violation</source>
         <translation>schending</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="251"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>bookmark</source>
         <translation>bladwijzer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="252"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>surface</source>
         <translation>oppervlakte</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="253"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>safety stop</source>
         <translation>veiligheidsstop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>safety stop (voluntary)</source>
         <translation>veiligheidsstop (vrijwillig)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="256"/>
+        <location filename="../core/libdivecomputer.c" line="257"/>
         <source>safety stop (mandatory)</source>
         <translation>veiligheidsstop (verplicht)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="257"/>
+        <location filename="../core/libdivecomputer.c" line="258"/>
         <source>deepstop</source>
         <translation>diepe stop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="258"/>
+        <location filename="../core/libdivecomputer.c" line="259"/>
         <source>ceiling (safety stop)</source>
         <translation>plafond (veiligheidsstop)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="259"/>
+        <location filename="../core/libdivecomputer.c" line="260"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>onder de vloer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="260"/>
+        <location filename="../core/libdivecomputer.c" line="261"/>
         <source>divetime</source>
         <translation>duiktijd</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="264"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>airtime</source>
         <translation>resterende luchttijd</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="265"/>
+        <location filename="../core/libdivecomputer.c" line="266"/>
         <source>rgbm</source>
         <translation>RGBM</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="266"/>
+        <location filename="../core/libdivecomputer.c" line="267"/>
         <source>heading</source>
         <translation>koers</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="267"/>
+        <location filename="../core/libdivecomputer.c" line="268"/>
         <source>tissue level warning</source>
         <translation>waarschuwing stikstofbelasting</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="277"/>
+        <location filename="../core/libdivecomputer.c" line="278"/>
         <source>invalid event number</source>
         <translation>ongeldig event-nummer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="613"/>
+        <location filename="../core/libdivecomputer.c" line="614"/>
         <source>Error parsing the datetime</source>
         <translation>Fout bij verwerken van de datum en tijd</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="631"/>
+        <location filename="../core/libdivecomputer.c" line="632"/>
         <source>Dive %d: %s</source>
         <translation>Duik nr. %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="637"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error parsing the divetime</source>
         <translation>Fout bij verwerken van de duikduur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
+        <location filename="../core/libdivecomputer.c" line="648"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fout bij het verwerken van de maximum duikdiepte</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="661"/>
+        <location filename="../core/libdivecomputer.c" line="662"/>
         <source>Error parsing temperature</source>
         <translation>Fout bij het verwerken van de temperatuur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="680"/>
+        <location filename="../core/libdivecomputer.c" line="681"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fout bij het verwerken van het aantal gasmengsels</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="691"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error obtaining water salinity</source>
         <translation>Fout bij het verkrijgen van het zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="700"/>
+        <location filename="../core/libdivecomputer.c" line="701"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fout bij bekomen van oppervlaktedruk</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
+        <location filename="../core/libdivecomputer.c" line="724"/>
         <source>Error obtaining dive mode</source>
         <translation>Fout bij bepalen duikmodus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="745"/>
+        <location filename="../core/libdivecomputer.c" line="746"/>
         <source>Error parsing the gas mix</source>
         <translation>Fout bij het verwerken van het gasmengsel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="771"/>
+        <location filename="../core/libdivecomputer.c" line="772"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Kan geen parser creëren voor %s %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="778"/>
         <source>Error registering the data</source>
-        <translation>Fout bij het registreren van de data</translation>
+        <translation>Fout bij het registreren van de gegevens</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="808"/>
+        <location filename="../core/libdivecomputer.c" line="809"/>
         <source>Error parsing the samples</source>
         <translation>Fout bij het verwerken van de samples</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="815"/>
+        <location filename="../core/libdivecomputer.c" line="816"/>
         <source>Already downloaded dive at %s</source>
         <translation>Duik al gedownload op %s</translation>
     </message>
@@ -10750,7 +10796,7 @@ Maximum</translation>
     <message>
         <location filename="../core/libdivecomputer.c" line="1171"/>
         <source>Dive data import error</source>
-        <translation>Fout bij importeren van duikdata</translation>
+        <translation>Fout bij importeren van duikgegevens</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1358"/>
@@ -10784,58 +10830,58 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve
         <translation>Geen nieuwe duiken uit duikcomputer geladen</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="175"/>
-        <location filename="../core/parse-xml.c" line="1207"/>
+        <location filename="../core/load-git.c" line="186"/>
+        <location filename="../core/parse-xml.c" line="1208"/>
         <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation>meedere GPS locaties voor deze duikstek; ook %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="201"/>
-        <location filename="../core/parse.c" line="442"/>
+        <location filename="../core/load-git.c" line="211"/>
+        <location filename="../core/parse.c" line="443"/>
         <source>additional name for site: %s
 </source>
         <translation>extra naam voor duikstek: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1664"/>
+        <location filename="../core/load-git.c" line="1659"/>
         <source>Load dives from local cache</source>
         <translation>Duiken uit lokale cache laden</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1668"/>
+        <location filename="../core/load-git.c" line="1663"/>
         <source>Successfully opened dive data</source>
-        <translation>Duik data openen gelukt</translation>
+        <translation>Duikgegevens openen gelukt</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="128"/>
-        <location filename="../core/ostctools.c" line="159"/>
+        <location filename="../core/ostctools.c" line="129"/>
+        <location filename="../core/ostctools.c" line="160"/>
         <source>Unknown DC in dive %d</source>
         <translation>Onbekende duikcomputer in duik %d</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="171"/>
+        <location filename="../core/ostctools.c" line="172"/>
         <source>Error - %s - parsing dive %d</source>
         <translation>Fout - %s - verwerking duik %d</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="400"/>
+        <location filename="../core/parse-xml.c" line="401"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Vreemd percentage %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="1664"/>
+        <location filename="../core/parse-xml.c" line="1663"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Fout bij analyse van &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2257"/>
+        <location filename="../core/parse-xml.c" line="2256"/>
         <source>Can&apos;t open stylesheet %s</source>
-        <translation>Kan de stylesheet %s niet openen</translation>
+        <translation>Kan stylesheet %s niet openen</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="113"/>
@@ -10860,7 +10906,7 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve
     </message>
     <message>
         <location filename="../core/planner.c" line="300"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="193"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="194"/>
         <source>SP change</source>
         <translation>SP wijziging</translation>
     </message>
@@ -11127,17 +11173,17 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve
         <translation>lage pO₂ waarde %.2f op %d:%02u met gas %s op diepte %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="881"/>
+        <location filename="../core/planner.c" line="900"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Gas %s kan niet gevonden worden</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1162"/>
+        <location filename="../core/planner.c" line="1183"/>
         <source>ean</source>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1406"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -11146,91 +11192,91 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1407"/>
+        <location filename="../core/profile.c" line="1417"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1413"/>
+        <location filename="../core/profile.c" line="1423"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1416"/>
+        <location filename="../core/profile.c" line="1426"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1418"/>
+        <location filename="../core/profile.c" line="1428"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1427"/>
+        <location filename="../core/profile.c" line="1437"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1430"/>
+        <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="1470"/>
+        <location filename="../core/profile.c" line="1480"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1462"/>
+        <location filename="../core/profile.c" line="1472"/>
         <source>Safety stop: %umin @ %.0f%s
 </source>
         <translation>Veiligheidsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1403"/>
+        <location filename="../core/profile.c" line="1413"/>
         <source>P: %d%s (%s)
 </source>
         <translation>P: %d%s (%s)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1420"/>
+        <location filename="../core/profile.c" line="1430"/>
         <source>pO₂: %.2fbar
 </source>
         <translation>pO₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1422"/>
+        <location filename="../core/profile.c" line="1432"/>
         <source>SCR ΔpO₂: %.2fbar
 </source>
         <translation>SCR ΔpO₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1425"/>
+        <location filename="../core/profile.c" line="1435"/>
         <source>pN₂: %.2fbar
 </source>
         <translation>pN₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1439"/>
+        <location filename="../core/profile.c" line="1449"/>
         <source>EAD: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -11239,7 +11285,7 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1445"/>
+        <location filename="../core/profile.c" line="1455"/>
         <source>END: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -11248,378 +11294,378 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1450"/>
+        <location filename="../core/profile.c" line="1460"/>
         <source>Density: %.1fg/ℓ
 </source>
         <translation>Dichtheid: %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1465"/>
+        <location filename="../core/profile.c" line="1475"/>
         <source>Safety stop: unknown time @ %.0f%s
 </source>
         <translation>Veiligheidsstop: onbekende tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1473"/>
+        <location filename="../core/profile.c" line="1483"/>
         <source>Deco: unknown time @ %.0f%s
 </source>
         <translation>Deco: onbekende tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1477"/>
+        <location filename="../core/profile.c" line="1487"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1479"/>
+        <location filename="../core/profile.c" line="1489"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1482"/>
+        <location filename="../core/profile.c" line="1492"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1485"/>
+        <location filename="../core/profile.c" line="1495"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1493"/>
+        <location filename="../core/profile.c" line="1503"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1496"/>
+        <location filename="../core/profile.c" line="1506"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1498"/>
+        <location filename="../core/profile.c" line="1508"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1502"/>
+        <location filename="../core/profile.c" line="1512"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1504"/>
+        <location filename="../core/profile.c" line="1514"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1517"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1510"/>
+        <location filename="../core/profile.c" line="1520"/>
         <source>Surface GF %.0f%%
 </source>
         <translation>Oppervlakte GF %.0f%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1513"/>
+        <location filename="../core/profile.c" line="1523"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berekend plafond %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1529"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Compartiment %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1536"/>
         <source>ICD in leading tissue
 </source>
         <translation>ICD in leidende weefsel
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1528"/>
+        <location filename="../core/profile.c" line="1538"/>
         <source>heart rate: %d
 </source>
         <translation>hartslag: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1530"/>
+        <location filename="../core/profile.c" line="1540"/>
         <source>bearing: %d
 </source>
         <translation>koers: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1533"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>gemiddelde diepte tot nu toe %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1630"/>
+        <location filename="../core/profile.c" line="1640"/>
         <source>ΔT:%d:%02dmin</source>
         <translation>ΔT:%d:%02dmin</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1634"/>
+        <location filename="../core/profile.c" line="1644"/>
         <source>%s ΔD:%.1f%s</source>
         <translation>%s ΔD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1638"/>
+        <location filename="../core/profile.c" line="1648"/>
         <source>%s ↓D:%.1f%s</source>
         <translation>%s ↓D:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1642"/>
+        <location filename="../core/profile.c" line="1652"/>
         <source>%s ↑D:%.1f%s</source>
         <translation>%s ↑D:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1646"/>
+        <location filename="../core/profile.c" line="1656"/>
         <source>%s øD:%.1f%s
 </source>
         <translation>%s øD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1650"/>
+        <location filename="../core/profile.c" line="1660"/>
         <source>%s ↓V:%.2f%s</source>
         <translation>%s ↓V:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1654"/>
+        <location filename="../core/profile.c" line="1664"/>
         <source>%s ↑V:%.2f%s</source>
         <translation>%s ↑V:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1658"/>
+        <location filename="../core/profile.c" line="1668"/>
         <source>%s øV:%.2f%s</source>
         <translation>%s øV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1665"/>
+        <location filename="../core/profile.c" line="1675"/>
         <source>%s ΔP:%d%s</source>
         <translation>%s ΔP:%d%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1690"/>
+        <location filename="../core/profile.c" line="1700"/>
         <source>%s SAC:%.*f%s/min</source>
         <translation>%s SAC:%.*f%s/min</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="68"/>
+        <location filename="../core/qthelper.cpp" line="70"/>
         <source>%1km</source>
         <translation>%1km</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="70"/>
+        <location filename="../core/qthelper.cpp" line="72"/>
         <source>%1m</source>
         <translation>%1m</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="74"/>
+        <location filename="../core/qthelper.cpp" line="76"/>
         <source>%1mi</source>
         <translation>%1mi</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="76"/>
+        <location filename="../core/qthelper.cpp" line="78"/>
         <source>%1yd</source>
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="234"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="236"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="235"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="237"/>
         <source>S</source>
         <translation>Z</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="236"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="238"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="237"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="239"/>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="583"/>
-        <location filename="../core/qthelper.cpp" line="760"/>
+        <location filename="../core/qthelper.cpp" line="585"/>
+        <location filename="../core/qthelper.cpp" line="762"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="586"/>
-        <location filename="../core/qthelper.cpp" line="762"/>
+        <location filename="../core/qthelper.cpp" line="588"/>
+        <location filename="../core/qthelper.cpp" line="764"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="837"/>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>AIR</source>
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="841"/>
         <source>EAN</source>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="914"/>
+        <location filename="../core/qthelper.cpp" line="916"/>
         <source>more than %1 days</source>
         <translation>meer dan %1 dagen</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="960"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation><numerusform>(%n duik)</numerusform><numerusform>(%n duiken)</numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>OXYGEN</source>
         <translation>ZUURSTOF</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1274"/>
+        <location filename="../core/qthelper.cpp" line="1276"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="480"/>
-        <location filename="../core/save-html.c" line="564"/>
-        <location filename="../core/worldmap-save.c" line="114"/>
+        <location filename="../core/save-html.c" line="482"/>
+        <location filename="../core/save-html.c" line="566"/>
+        <location filename="../core/worldmap-save.c" line="116"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan het bestand %s niet openen</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="499"/>
+        <location filename="../core/save-html.c" line="501"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="500"/>
+        <location filename="../core/save-html.c" line="502"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="501"/>
+        <location filename="../core/save-html.c" line="503"/>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="502"/>
+        <location filename="../core/save-html.c" line="504"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="503"/>
+        <location filename="../core/save-html.c" line="505"/>
         <source>Air temp.</source>
         <translation>Lucht temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="504"/>
+        <location filename="../core/save-html.c" line="506"/>
         <source>Water temp.</source>
         <translation>Water temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="507"/>
         <source>Dives</source>
         <translation>Duiken</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="506"/>
+        <location filename="../core/save-html.c" line="508"/>
         <source>Expand all</source>
         <translation>Alles uitklappen</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="507"/>
+        <location filename="../core/save-html.c" line="509"/>
         <source>Collapse all</source>
         <translation>Alles inklappen</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="508"/>
+        <location filename="../core/save-html.c" line="510"/>
         <source>Trips</source>
         <translation>Trips</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../core/save-html.c" line="511"/>
         <source>Statistics</source>
         <translation>Statistieken</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="510"/>
+        <location filename="../core/save-html.c" line="512"/>
         <source>Advanced search</source>
         <translation>Geavanceerd zoeken</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="513"/>
+        <location filename="../core/save-html.c" line="515"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="514"/>
+        <location filename="../core/save-html.c" line="516"/>
         <source>Visibility</source>
         <translation>Zicht</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="515"/>
+        <location filename="../core/save-html.c" line="517"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="516"/>
+        <location filename="../core/save-html.c" line="518"/>
         <source>Divemaster</source>
         <translation>Duikleider</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="517"/>
+        <location filename="../core/save-html.c" line="519"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="518"/>
+        <location filename="../core/save-html.c" line="520"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
@@ -11630,180 +11676,180 @@ EADD: %d%s / %.1fg/ℓ
     </message>
     <message>
         <location filename="../core/divesite-helper.cpp" line="29"/>
-        <location filename="../core/save-html.c" line="519"/>
+        <location filename="../core/save-html.c" line="521"/>
         <source>Tags</source>
         <translation>Trefwoorden</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="520"/>
+        <location filename="../core/save-html.c" line="522"/>
         <location filename="../smtk-import/smartrak.c" line="257"/>
         <location filename="../smtk-import/smartrak.c" line="330"/>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="521"/>
+        <location filename="../core/save-html.c" line="523"/>
         <source>Show more details</source>
         <translation>Toon meer details</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="524"/>
+        <location filename="../core/save-html.c" line="526"/>
         <source>Yearly statistics</source>
         <translation>Jaarlijkse statistieken</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="525"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Year</source>
         <translation>Jaar</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="526"/>
+        <location filename="../core/save-html.c" line="528"/>
         <source>Total time</source>
         <translation>Totale tijd</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="527"/>
+        <location filename="../core/save-html.c" line="529"/>
         <source>Average time</source>
         <translation>Gemiddelde tijd</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="528"/>
+        <location filename="../core/save-html.c" line="530"/>
         <source>Shortest time</source>
         <translation>Kortste tijd</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="529"/>
+        <location filename="../core/save-html.c" line="531"/>
         <source>Longest time</source>
         <translation>Langste tijd</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="530"/>
+        <location filename="../core/save-html.c" line="532"/>
         <source>Average depth</source>
         <translation>Gemiddelde diepte</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="531"/>
+        <location filename="../core/save-html.c" line="533"/>
         <source>Min. depth</source>
         <translation>Min. diepte</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="532"/>
+        <location filename="../core/save-html.c" line="534"/>
         <source>Max. depth</source>
         <translation>Max. diepte</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="533"/>
+        <location filename="../core/save-html.c" line="535"/>
         <source>Average SAC</source>
         <translation>Gemiddeld gasverbruik</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="534"/>
+        <location filename="../core/save-html.c" line="536"/>
         <source>Min. SAC</source>
         <translation>Min. SAC</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="537"/>
         <source>Max. SAC</source>
         <translation>Max. SAC</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="536"/>
+        <location filename="../core/save-html.c" line="538"/>
         <source>Average temp.</source>
         <translation>Gemiddelde temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="537"/>
+        <location filename="../core/save-html.c" line="539"/>
         <source>Min. temp.</source>
         <translation>Min. temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="538"/>
+        <location filename="../core/save-html.c" line="540"/>
         <source>Max. temp.</source>
         <translation>Max. temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="539"/>
+        <location filename="../core/save-html.c" line="541"/>
         <source>Back to list</source>
         <translation>Terugkeren naar de lijst</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="542"/>
+        <location filename="../core/save-html.c" line="544"/>
         <source>Dive #</source>
         <translation>Duik #</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="543"/>
+        <location filename="../core/save-html.c" line="545"/>
         <source>Dive profile</source>
         <translation>Duikprofiel</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="544"/>
+        <location filename="../core/save-html.c" line="546"/>
         <source>Dive information</source>
         <translation>Duikinformatie</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="545"/>
+        <location filename="../core/save-html.c" line="547"/>
         <source>Dive equipment</source>
         <translation>Duikuitrusting</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="555"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="547"/>
+        <location filename="../core/save-html.c" line="549"/>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="550"/>
         <source>Work pressure</source>
         <translation>Werkdruk</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="549"/>
+        <location filename="../core/save-html.c" line="551"/>
         <source>Start pressure</source>
         <translation>Startdruk</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="550"/>
+        <location filename="../core/save-html.c" line="552"/>
         <source>End pressure</source>
         <translation>Einddruk</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="551"/>
+        <location filename="../core/save-html.c" line="553"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="552"/>
+        <location filename="../core/save-html.c" line="554"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="554"/>
+        <location filename="../core/save-html.c" line="556"/>
         <source>Events</source>
         <translation>Gebeurtenissen</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="555"/>
+        <location filename="../core/save-html.c" line="557"/>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="556"/>
+        <location filename="../core/save-html.c" line="558"/>
         <source>Value</source>
         <translation>Waarde</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="557"/>
+        <location filename="../core/save-html.c" line="559"/>
         <source>Coordinates</source>
         <translation>Coördinaten</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="558"/>
+        <location filename="../core/save-html.c" line="560"/>
         <source>Dive status</source>
         <translation>Duikstatus</translation>
     </message>
@@ -11823,17 +11869,17 @@ EADD: %d%s / %.1fg/ℓ
         <translation>Alle (op min. temp statistiek)</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/dive.c" line="29"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="34"/>
+        <location filename="../core/dive.c" line="30"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="35"/>
+        <location filename="../core/dive.c" line="31"/>
         <source>Freedive</source>
         <translation>Apneu</translation>
     </message>
@@ -11843,67 +11889,67 @@ EADD: %d%s / %.1fg/ℓ
         <translation>Alle (op trip statistiek)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>May</source>
         <translation>mei</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Sep</source>
         <translation>sept</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="32"/>
+        <location filename="../core/uemis-downloader.c" line="34"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
@@ -11912,7 +11958,7 @@ Duikcomputer ontkoppelen en weer aansluiten
 en op &apos;Opnieuw&apos; klikken</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="33"/>
+        <location filename="../core/uemis-downloader.c" line="35"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
@@ -11921,104 +11967,104 @@ Duikcomputer ontkoppelen en weer aansluiten
 en op &apos;Opnieuw&apos; klikken</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="34"/>
+        <location filename="../core/uemis-downloader.c" line="36"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation>Heel korte tekst naar req.txt geschreven
 Is de Uemis Zurich correct aangesloten?</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="35"/>
+        <location filename="../core/uemis-downloader.c" line="37"/>
         <source>No dives to download.</source>
         <translation>Geen duiken te laden</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="499"/>
+        <location filename="../core/uemis-downloader.c" line="501"/>
         <source>%s %s</source>
         <translation>%s %s</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="535"/>
+        <location filename="../core/uemis-downloader.c" line="537"/>
         <source>data</source>
         <translation>gegevens</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="563"/>
+        <location filename="../core/uemis-downloader.c" line="565"/>
         <source>dive log #</source>
         <translation>duiklog #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="565"/>
+        <location filename="../core/uemis-downloader.c" line="567"/>
         <source>dive spot #</source>
         <translation>duik locatie #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="567"/>
+        <location filename="../core/uemis-downloader.c" line="569"/>
         <source>details for #</source>
         <translation>details voor #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>wetsuit</source>
         <translation>natpak</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>semidry</source>
         <translation>semidroog</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>drysuit</source>
         <translation>droogpak</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>vest</source>
         <translation>vest</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>jacket</source>
         <translation>jack</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>full suit</source>
         <translation>tweedelig pak</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>2 pcs full suit</source>
         <translation>2-delig pak</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>membrane</source>
         <translation>membraan droogpak</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1336"/>
+        <location filename="../core/uemis-downloader.c" line="1338"/>
         <source>Initialise communication</source>
         <translation>Start communicatie</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1339"/>
+        <location filename="../core/uemis-downloader.c" line="1341"/>
         <source>Uemis init failed</source>
         <translation>Uemis niet geïnitialiseerd</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1351"/>
+        <location filename="../core/uemis-downloader.c" line="1353"/>
         <source>Start download</source>
         <translation>Begin download</translation>
     </message>
@@ -12113,76 +12159,76 @@ Is de Uemis Zurich correct aangesloten?</translation>
         <translation>Alarm: lege batterij</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="42"/>
+        <location filename="../core/worldmap-save.c" line="44"/>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="44"/>
+        <location filename="../core/worldmap-save.c" line="46"/>
         <source>Time:</source>
         <translation>Tijd:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="46"/>
+        <location filename="../core/worldmap-save.c" line="48"/>
         <source>Duration:</source>
         <translation>Duur:</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
+        <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="140"/>
-        <location filename="../core/worldmap-save.c" line="47"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
+        <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="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="140"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="100"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
+        <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="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/qthelper.h" line="76"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
+        <location filename="../core/divelogexportlogic.cpp" line="57"/>
+        <location filename="../core/divelogexportlogic.cpp" line="95"/>
+        <location filename="../core/qthelper.h" line="72"/>
+        <location filename="../desktop-widgets/templatelayout.h" line="102"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="152"/>
+        <location filename="../core/divelogexportlogic.cpp" line="153"/>
         <source>Cannot find a folder called &apos;theme&apos; in the standard locations</source>
         <translation>Kan map &apos;theme&apos; niet vinden in de standaard locaties</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="50"/>
+        <location filename="../core/worldmap-save.c" line="52"/>
         <source>Max. depth:</source>
         <translation>Max. diepte:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="53"/>
+        <location filename="../core/worldmap-save.c" line="55"/>
         <source>Air temp.:</source>
         <translation>Luchttemp.:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="56"/>
+        <location filename="../core/worldmap-save.c" line="58"/>
         <source>Water temp.:</source>
         <translation>Watertemp.:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="58"/>
+        <location filename="../core/worldmap-save.c" line="60"/>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="62"/>
+        <location filename="../core/worldmap-save.c" line="64"/>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
@@ -12302,27 +12348,27 @@ Is de Uemis Zurich correct aangesloten?</translation>
         <translation>Stad</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="914"/>
+        <location filename="../core/save-git.c" line="916"/>
         <source>Start saving data</source>
         <translation>Opslaan data gestart</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="923"/>
+        <location filename="../core/save-git.c" line="925"/>
         <source>Start saving dives</source>
         <translation>Opslaan duiken gestart</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="956"/>
+        <location filename="../core/save-git.c" line="958"/>
         <source>Done creating local cache</source>
         <translation>Lokale cache aangemaakt</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="1207"/>
+        <location filename="../core/save-git.c" line="1209"/>
         <source>Preparing to save data</source>
         <translation>Voorbereiden data opslag</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1661"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1658"/>
         <source>modechange</source>
         <translation>Duikmodus wijziging</translation>
     </message>
@@ -12337,57 +12383,57 @@ Is de Uemis Zurich correct aangesloten?</translation>
         <translation>Dit punt verwijderen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="558"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="559"/>
         <source>Don&apos;t save an empty log to the cloud</source>
         <translation>Bewaar geen lege duiklog in de cloud</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="46"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/>
         <source>Average</source>
         <translation>Gemiddelde</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="49"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
         <source>Minimum</source>
         <translation>Kleinste</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="52"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
         <source>Maximum</source>
         <translation>Grootste</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="406"/>
         <source>Invalid response from server</source>
         <translation>Ongeldig antwoord van de server</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="414"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>XML element &apos;DiveDateReader&apos; werd verwacht, maar kreeg &apos;%1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="460"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Verwacht XML element &apos;DiveDates&apos; werd niet gevonden</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="467"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Onjuist gevormd XML antwoord. Regel %1: %2</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="121"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="122"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="743"/>
+        <location filename="../core/save-xml.c" line="749"/>
         <source>Failed to save dives to %s (%s)</source>
         <translation>Fout bij opslaan duiken naar %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="864"/>
+        <location filename="../core/save-xml.c" line="871"/>
         <source>Failed to save divesites to %s (%s)</source>
         <translation>Fout bij opslaan duikstekken naar %s (%s)</translation>
     </message>
@@ -12805,7 +12851,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="610"/>
         <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
-        <translation>Gebruikt bij berekenen van Best Mix. Selecteer Best Mix diepte in de &apos;Beschikbare gassen&apos; tabel door gas diepte, gevolgd door &quot;B&quot; (Best Trimix mis) of BN (Best Nitrox mix) in te voeren.</translation>
+        <translation>Gebruikt bij berekenen van Best Mix. Selecteer Best Mix diepte in de &apos;Beschikbare gassen&apos; tabel door gas diepte, gevolgd door &quot;B&quot; (Best Trimix mix) of &quot;BN&quot; (Best Nitrox mix) in te voeren</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts
index a8e2a2968..39b83def0 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -4,20 +4,11 @@
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="10"/>
         <location filename="../mobile-widgets/qml/About.qml" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/About.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/About.qml" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/About.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/About.qml" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/About.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/About.qml" line="20"/>
         <source>About Subsurface-mobile</source>
         <translation>Sobre Subsurface-mobile</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/About.qml" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/About.qml" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/About.qml" line="37"/>
         <source>A mobile version of the free Subsurface divelog software.
 </source>
         <translation>Uma versão móvel do logbook livre e gratuito Subsurface
@@ -25,16 +16,11 @@
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="38"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/About.qml" line="38"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/About.qml" line="38"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/About.qml" line="38"/>
         <source>View your dive logs while on the go.</source>
         <translation>Veja os seus registos de mergulho longe de casa.</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/About.qml" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/About.qml" line="49"/>
         <source>Version: %1
 
 © Subsurface developer team
@@ -45,46 +31,12 @@
 2011-2019</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/About.qml" line="49"/>
-        <source>Version: %1
-
-© Subsurface developer team
-2011-2018</source>
-        <translation>Versão: %1
-
-© Subsurface developer team
-2011-2018</translation>
-    </message>
-    <message>
         <location filename="../mobile-widgets/qml/About.qml" line="62"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/About.qml" line="62"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/About.qml" line="62"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/About.qml" line="62"/>
         <source>Copy logs to clipboard</source>
         <translation>Copiar registos para a área de transferência</translation>
     </message>
 </context>
 <context>
-    <name>AddDivesToTrip</name>
-    <message numerus="yes">
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="700"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="700"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="700"/>
-        <source>add %n dives to trip</source>
-        <translation><numerusform>adicionar mergulho à viagem</numerusform><numerusform>adicionar %n mergulhos à viagem</numerusform></translation>
-    </message>
-</context>
-<context>
-    <name>AutogroupDives</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="720"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="720"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="720"/>
-        <source>autogroup dives</source>
-        <translation>agrupar mergulhos automaticamente</translation>
-    </message>
-</context>
-<context>
     <name>BackButton</name>
     <message>
         <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="50"/>
@@ -96,84 +48,51 @@
     <name>BtDeviceSelectionDialog</name>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="240"/>
         <source>Remote Bluetooth device selection</source>
         <translation>Selecção do dispositivo bluetooth remoto</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="172"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="32"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="32"/>
         <source>Discovered devices</source>
         <translation>Dispositivos encontrados</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="22"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="35"/>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="35"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="37"/>
         <source>Quit</source>
         <translation>Sair</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="193"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="193"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="193"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="251"/>
         <source>Bluetooth mode</source>
         <translation>Modo Bluetooth</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="201"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="201"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="201"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="252"/>
         <source>Auto</source>
         <translation>Automático</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="206"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="253"/>
         <source>Force LE</source>
         <translation>Forçar LE</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="211"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="254"/>
         <source>Force classical</source>
         <translation>Forçar modo clássico</translation>
@@ -190,174 +109,102 @@
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="229"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="33"/>
         <source>Scan</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="242"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="34"/>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="66"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="26"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="26"/>
         <source>Local Bluetooth device details</source>
         <translation>Detalhes do dispositivo bluetooth local</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="75"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="245"/>
         <source>Name: </source>
         <translation>Nome:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="89"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="28"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="28"/>
         <source>Address:</source>
         <translation>Endereço:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="118"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="30"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="30"/>
         <source>Bluetooth powered on</source>
         <translation>Bluetooth ligado</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="140"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="31"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="31"/>
         <source>Turn on/off</source>
         <translation>Ligar/desligar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="150"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="27"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="27"/>
         <source>Select device:</source>
         <translation>Seleccionar dispositivo:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="101"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>A tentar ligar o dispositivo bluetooth local...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="104"/>
         <source>Trying to turn off the local Bluetooth device...</source>
         <translation>A tentar desligar o dispositivo bluetooth local...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="132"/>
         <source>Remote devices list was cleared.</source>
         <translation>A lista de dispositivos remotos foi limpa.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="144"/>
         <source>Scanning for remote devices...</source>
         <translation>A procurar dispositivos remotos...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="157"/>
         <source>Scanning finished successfully.</source>
         <translation>A busca terminou com sucesso.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
         <source>The local Bluetooth device was %1.</source>
         <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
         <translation>O dispositivo Bluetooth local foi %1.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
         <source>turned on</source>
         <translation>ligado</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
         <source>turned off</source>
         <translation>desligado</translation>
     </message>
@@ -365,15 +212,6 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="186"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="335"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="335"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="335"/>
         <source>UNPAIRED</source>
         <translation>DESEMPARELHADO</translation>
     </message>
@@ -381,15 +219,6 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="190"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="323"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="333"/>
         <source>PAIRED</source>
         <translation>EMPARELHADO</translation>
     </message>
@@ -397,249 +226,135 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="193"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="328"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="337"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="334"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="334"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="334"/>
         <source>AUTHORIZED_PAIRED</source>
         <translation>EMPARELHADO_COM_AUTORIZAÇÃO</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="205"/>
         <source>%1 (%2)   [State: %3]</source>
         <translation>%1 (%2) [Estado: %3]</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="228"/>
         <source>The device %1 can be used for connection. You can press the Save button.</source>
         <translation>O dispositivo %1 pode ser usado para a ligação. Pode premir o botão Gravar.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="244"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="351"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="351"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="351"/>
         <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source>
         <translation>O dispositivo %1 tem que ser emparelhado antes de poder ser utilizado. Por favor utilize o menu de contexto para as opções de emparelhamento.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="247"/>
         <source>A device needs a non-zero address for a connection.</source>
         <translation>Um dispositivo precisa de um endereço não nulo para estabelecer a ligação</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="267"/>
         <source>The local device was changed.</source>
         <translation>O dispositivo local foi alterado.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="286"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="283"/>
         <source>Pair</source>
         <translation>Emparelhar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="287"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="284"/>
         <source>Remove pairing</source>
         <translation>Remover emparelhamento</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="300"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="300"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="300"/>
         <source>Trying to pair device %1</source>
         <translation>A tentar emparelhar o dispositivo %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="304"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="304"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="304"/>
         <source>Trying to unpair device %1</source>
         <translation>A tentar desemparelhar o dispositvo %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="316"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="316"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="316"/>
         <source>Device %1 was unpaired.</source>
         <translation>O dispositivo %1 foi desemparelhado.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="326"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="323"/>
         <source>Device %1 was paired.</source>
         <translation>O dispositivo %1 foi emparelhado.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="331"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="328"/>
         <source>Device %1 was paired and is authorized.</source>
         <translation>O dispositivo %1 foi emparelhado e está autorizado.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="354"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>O dispositivo %1  já pode ser usado para a ligação. Pode premir o botão Gravar.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="368"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="366"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="366"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="366"/>
         <source>Local device error: %1.</source>
         <translation>Erro no dispositivo local: %1.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="367"/>
         <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source>
         <translation>Erro de emparelhamento. Se o dispositivo remoto necessita de um PIN próprio, por favor tente emparelhar os dispositivos usando as ferramentas do seu sistema operativo.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="369"/>
         <source>Unknown error</source>
         <translation>Erro desconhecido</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source>
         <translation>O adaptador Bluetooth está desligado. Ligue-o antes de procurar outros dispositivos.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="381"/>
         <source>Writing to or reading from the device resulted in an error.</source>
         <translation>A leitura ou escritia de/para o dispositivo deu um erro.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="384"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="384"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="384"/>
         <source>An unknown error has occurred.</source>
         <translation>Ocorreu um erro desconhecido.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="388"/>
         <source>Device discovery error: %1.</source>
         <translation>Erro na descoberta do dispositivo: %1.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="439"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="439"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="439"/>
         <source>Not available</source>
         <translation>Não disponível</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="446"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="446"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="446"/>
         <source>The local Bluetooth adapter cannot be accessed.</source>
         <translation>Não é possível aceder ao adaptador Bluetooth local. </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="487"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="485"/>
         <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source>
         <translation>O agente de descoberta de dispositivos não foi criado porque o endereço %1 não coincide com o endereço físico de nenhum dos dispositivos Bluetooth locais.</translation>
     </message>
 </context>
 <context>
-    <name>BuddyFilter</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="587"/>
-        <source>Person</source>
-        <translation>Pessoa</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="588"/>
-        <source>Searches for buddies and divemasters</source>
-        <translation>Busca por companheiros e guias de mergulho</translation>
-    </message>
-</context>
-<context>
-    <name>BuddyFilterModel</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/filtermodels.cpp" line="491"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/filtermodels.cpp" line="491"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/filtermodels.cpp" line="491"/>
-        <source>No buddies</source>
-        <translation>Sem companheiros</translation>
-    </message>
-</context>
-<context>
     <name>CheckCloudConnection</name>
     <message numerus="yes">
         <location filename="../core/checkcloudconnection.cpp" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/checkcloudconnection.cpp" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/checkcloudconnection.cpp" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/checkcloudconnection.cpp" line="58"/>
         <source>Waiting for cloud connection (%n second(s) passed)</source>
         <translation><numerusform>À espera da ligação remota (passou %n segundo)</numerusform><numerusform>À espera da ligação remota (passaram %n segundos)</numerusform></translation>
     </message>
     <message>
         <location filename="../core/checkcloudconnection.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/checkcloudconnection.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/checkcloudconnection.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/checkcloudconnection.cpp" line="65"/>
         <source>Cloud connection failed</source>
         <translation>A ligação remota falhou</translation>
     </message>
@@ -648,65 +363,41 @@
     <name>CloudCredentials</name>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="49"/>
         <source>Cloud credentials</source>
         <translation>Credenciais da nuvem</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="55"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="71"/>
         <source>Password</source>
         <translation>Palavra-passe</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="89"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="106"/>
         <source>Register</source>
         <translation>Registar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="117"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="133"/>
         <source>Sign-in or Register</source>
         <translation>Faça log in ou registe-se</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="144"/>
         <source>No cloud mode</source>
         <translation>Modo local </translation>
     </message>
@@ -714,10 +405,7 @@
 <context>
     <name>CloudStorageAuthenticate</name>
     <message>
-        <location filename="../core/cloudstorage.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cloudstorage.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cloudstorage.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cloudstorage.cpp" line="65"/>
+        <location filename="../core/cloudstorage.cpp" line="66"/>
         <source>Cloud account verification required, enter PIN in preferences</source>
         <translation>É necessária a verificação da conta de armazenamento remoto; introduzir o PIN nas preferências</translation>
     </message>
@@ -725,295 +413,187 @@
 <context>
     <name>ColumnNameProvider</name>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Dive #</source>
         <translation>Mergulho #</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Cyl. size</source>
         <translation>Capacidade da garrafa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Start pressure</source>
         <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>End pressure</source>
         <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Max. depth</source>
         <translation>Prof. Max.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Avg. depth</source>
         <translation>Prof. Média</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Divemaster</source>
         <translation>Guia de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Buddy</source>
         <translation>Companheiros</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Tags</source>
         <translation>Categorias</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Air temp.</source>
         <translation>Temp. do ar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Water temp.</source>
         <translation>Temp. da água</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>Sample time</source>
         <translation>Taxa de amostragem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>Sample depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>Sample temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>Sample pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>Sample CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>Sample NDL</source>
         <translation>NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="70"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="73"/>
         <source>Sample TTS</source>
         <translation>TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="70"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="73"/>
         <source>Sample stopdepth</source>
         <translation>Profundidade da paragem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="70"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="73"/>
         <source>Sample pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="71"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Amostrar o sensor de pO₂ #1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="71"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Amostrar o sensor de pO₂ #2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="71"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Amostrar o sensor de pO₂ #3</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="72"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="75"/>
         <source>Sample setpoint</source>
         <translation>Amostrar o setpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="72"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="75"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="72"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="75"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="75"/>
         <source>Sample heartrate</source>
         <translation>Frequência cardíaca</translation>
     </message>
@@ -1022,22 +602,16 @@
     <name>Command</name>
     <message>
         <location filename="../desktop-widgets/command_base.cpp" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_base.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_base.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_base.cpp" line="17"/>
         <source>&amp;Undo</source>
         <translation>&amp;Reverter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/command_base.cpp" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_base.cpp" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_base.cpp" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_base.cpp" line="22"/>
         <source>&amp;Redo</source>
         <translation>&amp;Refazer</translation>
     </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="77"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="92"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation><numerusform>Editar %1 mergulho</numerusform><numerusform>Editar %n mergulhos</numerusform></translation>
@@ -1046,10 +620,7 @@
 <context>
     <name>Command::AddDive</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="488"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="488"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="488"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="380"/>
         <source>add dive</source>
         <translation>adicionar mergulho</translation>
     </message>
@@ -1057,7 +628,7 @@
 <context>
     <name>Command::AddDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="83"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="79"/>
         <source>add dive site</source>
         <translation>adicionar local de mergulho</translation>
     </message>
@@ -1065,7 +636,7 @@
 <context>
     <name>Command::AddDivesToTrip</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="669"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="690"/>
         <source>add %n dives to trip</source>
         <translation><numerusform>adicionar %1 mergulho à viagem</numerusform><numerusform>adicionar %n mergulhos à viagem</numerusform></translation>
     </message>
@@ -1073,7 +644,7 @@
 <context>
     <name>Command::AutogroupDives</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="689"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="710"/>
         <source>autogroup dives</source>
         <translation>agrupar mergulhos automaticamente</translation>
     </message>
@@ -1081,7 +652,7 @@
 <context>
     <name>Command::CreateTrip</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="676"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="697"/>
         <source>create trip</source>
         <translation>criar viagem</translation>
     </message>
@@ -1089,10 +660,7 @@
 <context>
     <name>Command::DeleteDive</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="530"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="558"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="558"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="558"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="532"/>
         <source>delete %n dive(s)</source>
         <translation><numerusform>eliminar mergulho</numerusform><numerusform>eliminar %n mergulhos</numerusform></translation>
     </message>
@@ -1100,7 +668,7 @@
 <context>
     <name>Command::DeleteDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="864"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="885"/>
         <source>delete dive computer</source>
         <translation>eliminar computador de mergulho</translation>
     </message>
@@ -1108,7 +676,7 @@
 <context>
     <name>Command::DeleteDiveSites</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divesite.cpp" line="141"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="137"/>
         <source>delete %n dive site(s)</source>
         <translation><numerusform>apagar %1 local de mergulho</numerusform><numerusform>apagar %n locais de mergulho</numerusform></translation>
     </message>
@@ -1116,7 +684,7 @@
 <context>
     <name>Command::EditAirTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="229"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="241"/>
         <source>air temperature</source>
         <translation>temperatura do ar</translation>
     </message>
@@ -1124,7 +692,7 @@
 <context>
     <name>Command::EditAtmPress</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="274"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="286"/>
         <source>Atm. pressure</source>
         <translation>Pressão atmosférica</translation>
     </message>
@@ -1132,7 +700,7 @@
 <context>
     <name>Command::EditDepth</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="322"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="334"/>
         <source>depth</source>
         <translation>profundidade</translation>
     </message>
@@ -1140,7 +708,7 @@
 <context>
     <name>Command::EditDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="344"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="356"/>
         <source>dive site</source>
         <translation>local de mergulho</translation>
     </message>
@@ -1148,7 +716,7 @@
 <context>
     <name>Command::EditDiveSiteCountry</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="265"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="275"/>
         <source>Edit dive site country</source>
         <translation>Editar país do local de mergulho</translation>
     </message>
@@ -1156,7 +724,7 @@
 <context>
     <name>Command::EditDiveSiteDescription</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="219"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="229"/>
         <source>Edit dive site description</source>
         <translation>Editar descrição do local de mergulho</translation>
     </message>
@@ -1164,7 +732,7 @@
 <context>
     <name>Command::EditDiveSiteLocation</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="290"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="302"/>
         <source>Edit dive site location</source>
         <translation>Editar localização do ponto de mergulho</translation>
     </message>
@@ -1172,7 +740,7 @@
 <context>
     <name>Command::EditDiveSiteName</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="196"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="205"/>
         <source>Edit dive site name</source>
         <translation>Editar nome do local de mergulho</translation>
     </message>
@@ -1180,7 +748,7 @@
 <context>
     <name>Command::EditDiveSiteNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="242"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="252"/>
         <source>Edit dive site notes</source>
         <translation>Editar notas do local de mergulho</translation>
     </message>
@@ -1188,7 +756,7 @@
 <context>
     <name>Command::EditDiveSiteTaxonomy</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="319"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="332"/>
         <source>Edit dive site taxonomy</source>
         <translation>Editar taxonomia dos locais de mergulho</translation>
     </message>
@@ -1196,7 +764,7 @@
 <context>
     <name>Command::EditDuration</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="298"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="310"/>
         <source>duration</source>
         <translation>duração</translation>
     </message>
@@ -1204,7 +772,7 @@
 <context>
     <name>Command::EditNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="144"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="156"/>
         <source>notes</source>
         <translation>notas</translation>
     </message>
@@ -1212,7 +780,7 @@
 <context>
     <name>Command::EditRating</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="187"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="199"/>
         <source>rating</source>
         <translation>classificação</translation>
     </message>
@@ -1220,7 +788,7 @@
 <context>
     <name>Command::EditSuit</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="166"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="178"/>
         <source>suit</source>
         <translation>fato</translation>
     </message>
@@ -1252,7 +820,7 @@
 <context>
     <name>Command::EditVisibility</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="208"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="220"/>
         <source>visibility</source>
         <translation>visibilidade</translation>
     </message>
@@ -1260,7 +828,7 @@
 <context>
     <name>Command::EditWaterTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="253"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="265"/>
         <source>water temperature</source>
         <translation>temperatura da água</translation>
     </message>
@@ -1268,7 +836,7 @@
 <context>
     <name>Command::ImportDiveSites</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="105"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="101"/>
         <source>import dive sites from %1</source>
         <translation>importar locais de mergulho de %1</translation>
     </message>
@@ -1276,7 +844,7 @@
 <context>
     <name>Command::ImportDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="452"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="454"/>
         <source>import %n dive(s) from %1</source>
         <translation><numerusform>importar %1 mergulho de %1</numerusform><numerusform>importar %n mergulhos de %1</numerusform></translation>
     </message>
@@ -1284,7 +852,7 @@
 <context>
     <name>Command::MergeDiveSites</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="347"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="360"/>
         <source>merge dive sites</source>
         <translation>juntar locais de mergulho</translation>
     </message>
@@ -1292,7 +860,7 @@
 <context>
     <name>Command::MergeDives</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="869"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="890"/>
         <source>merge dive</source>
         <translation>juntar mergulho</translation>
     </message>
@@ -1300,7 +868,7 @@
 <context>
     <name>Command::MoveDiveComputerToFront</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="858"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="879"/>
         <source>move dive computer to front</source>
         <translation>mover computador de mergulho para a frente</translation>
     </message>
@@ -1308,7 +876,7 @@
 <context>
     <name>Command::PurgeUnusedDiveSites</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="161"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="157"/>
         <source>purge unused dive sites</source>
         <translation>eliminar locais de mergulho não usados</translation>
     </message>
@@ -1316,7 +884,7 @@
 <context>
     <name>Command::RemoveAutogenTrips</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="657"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="678"/>
         <source>remove autogenerated trips</source>
         <translation>remover viagens criadas automaticamente</translation>
     </message>
@@ -1324,7 +892,7 @@
 <context>
     <name>Command::RemoveDivesFromTrip</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="645"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="666"/>
         <source>remove %n dive(s) from trip</source>
         <translation><numerusform>remover %1 mergulho da viagem</numerusform><numerusform>remover %n mergulhos da viagem</numerusform></translation>
     </message>
@@ -1332,7 +900,7 @@
 <context>
     <name>Command::RenumberDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="607"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="614"/>
         <source>renumber %n dive(s)</source>
         <translation><numerusform>renumerar %1 mergulho</numerusform><numerusform>renumerar %n mergulhos</numerusform></translation>
     </message>
@@ -1340,7 +908,7 @@
 <context>
     <name>Command::ShiftTime</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="569"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="571"/>
         <source>shift time of %n dives</source>
         <translation><numerusform>deslocar tempos do %1 mergulho</numerusform><numerusform>deslocar tempos de %n mergulhos</numerusform></translation>
     </message>
@@ -1348,7 +916,7 @@
 <context>
     <name>Command::SplitDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="802"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="823"/>
         <source>split dive computer</source>
         <translation>dividir computador de mergulho</translation>
     </message>
@@ -1356,7 +924,7 @@
 <context>
     <name>Command::SplitDives</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="784"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="805"/>
         <source>split dive</source>
         <translation>dividir mergulho</translation>
     </message>
@@ -1364,66 +932,42 @@
 <context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="181"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="221"/>
+        <location filename="../core/configuredivecomputer.cpp" line="183"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Não foi possível gravar a cópia de segurança %1. Mensagem de erro: %2</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="237"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="237"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="237"/>
+        <location filename="../core/configuredivecomputer.cpp" line="199"/>
         <source>Could not open backup file: %1</source>
         <translation>Não foi possível abrir a cópia de segurança: %1</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="545"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="585"/>
+        <location filename="../core/configuredivecomputer.cpp" line="547"/>
         <source>Dive computer details read successfully</source>
         <translation>Detalhes do computador de mergulho lidos com sucesso</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="554"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="594"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="594"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="594"/>
+        <location filename="../core/configuredivecomputer.cpp" line="556"/>
         <source>Setting successfully written to device</source>
         <translation>Parâmetro gravado com sucesso no dispositivo</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="563"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="603"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="603"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="603"/>
+        <location filename="../core/configuredivecomputer.cpp" line="565"/>
         <source>Device firmware successfully updated</source>
         <translation>Firmware do dispositivo actualizado com sucesso</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="572"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="612"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="612"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="612"/>
+        <location filename="../core/configuredivecomputer.cpp" line="574"/>
         <source>Device settings successfully reset</source>
         <translation>Configurações do dispositivo reconfiguradas com sucesso</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="588"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="628"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="628"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="628"/>
+        <location filename="../core/configuredivecomputer.cpp" line="590"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto do libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="607"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="647"/>
+        <location filename="../core/configuredivecomputer.cpp" line="609"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Não foi possível estabelecer uma ligação ao computador de mergulho.</translation>
     </message>
@@ -1432,153 +976,102 @@
     <name>ConfigureDiveComputerDialog</name>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2535"/>
         <source>Configure dive computer</source>
         <translation>Configurar computador de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="22"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2536"/>
         <source>Device or mount point</source>
         <translation>Dispositivo ou ponto de montagem</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2537"/>
         <source>Connect via Bluetooth</source>
         <translation>Ligar via Bluetooth</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2538"/>
         <source>Connect</source>
         <translation>Ligar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2539"/>
         <source>Disconnect</source>
         <translation>Desligar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2540"/>
         <source>Retrieve available details</source>
         <translation>Recuperar detalhes disponíveis</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2542"/>
         <source>Read settings from backup file or from device before writing to the device</source>
         <translation>Ler configurações da cópia de segurança ou do dispositivo antes de carregá-las para o dispositivo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2544"/>
         <source>Save changes to device</source>
         <translation>Gravar alterações no dispositivo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2546"/>
         <source>Read settings from backup file or from device before writing to a backup file</source>
         <translation>Ler configurações do ficheiro de backup ou do dispositivo antes de criar uma cópia de segurança</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2548"/>
         <source>Backup</source>
         <translation>Cópia de segurança</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="129"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2549"/>
         <source>Restore backup</source>
         <translation>Restaurar cópia de segurança</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="139"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2550"/>
         <source>Update firmware</source>
         <translation>Actualizar firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2551"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Gravar registo do libdivecomputer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2552"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2553"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="241"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2564"/>
         <source>Suunto Vyper family</source>
         <translation>Família Suunto Vyper</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2562"/>
         <source>OSTC 4</source>
         <translation>OSTC 4</translation>
@@ -1588,18 +1081,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1194"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2492"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3567"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1194"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2492"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3567"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1194"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2492"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3567"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1194"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2492"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3567"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2589"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2751"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2911"/>
@@ -1610,12 +1091,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1201"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2499"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1201"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2499"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1201"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2499"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1201"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1624,12 +1099,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1206"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2504"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1206"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2504"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1206"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2504"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1206"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1638,12 +1107,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1211"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2509"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1211"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2509"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1211"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2509"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1211"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1672,72 +1135,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="759"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="799"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="822"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1219"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1767"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1790"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1868"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1934"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1960"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2042"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2058"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2391"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2517"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2888"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2932"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2955"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2991"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3069"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="759"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="799"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="822"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1219"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1767"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1790"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1868"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1934"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1960"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2042"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2058"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2391"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2517"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2888"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2932"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2955"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2991"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3069"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="759"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="799"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="822"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1219"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1767"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1790"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1868"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1934"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1960"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2042"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2058"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2391"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2517"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2888"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2932"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2955"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2991"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -1766,12 +1163,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1230"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2528"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1230"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2528"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1230"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2528"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1230"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1780,12 +1171,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2533"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2533"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2533"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1794,12 +1179,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2538"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2538"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2538"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1808,12 +1187,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1245"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2543"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1245"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2543"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1245"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2543"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1245"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1822,12 +1195,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1254"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1254"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1254"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1254"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1836,12 +1203,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1259"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2557"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1259"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2557"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1259"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2557"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1259"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1852,18 +1213,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1267"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2565"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3662"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1267"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2565"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3662"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1267"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2565"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3662"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1267"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2565"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3662"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2567"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2701"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2879"/>
@@ -1876,18 +1225,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1290"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2588"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3685"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1290"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2588"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3685"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1290"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2588"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3685"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1290"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2588"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3685"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2569"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2702"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2880"/>
@@ -1898,12 +1235,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1301"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2599"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1301"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2599"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1301"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2599"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1301"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1912,12 +1243,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1306"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2604"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1306"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2604"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1306"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2604"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1306"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1926,12 +1251,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1311"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2609"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1311"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2609"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1311"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2609"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1311"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1940,12 +1259,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1326"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2624"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1326"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2624"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1326"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2624"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1326"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1955,15 +1268,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1336"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2634"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1336"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2634"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1336"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -1973,12 +1277,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1346"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2644"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1346"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2644"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1346"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2644"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1346"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1988,15 +1286,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1356"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2654"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3856"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1356"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2654"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3856"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1356"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2654"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2006,12 +1295,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1366"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2664"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1366"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2664"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1366"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2664"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1366"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2020,12 +1303,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1379"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2677"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1379"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2677"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1379"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2677"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1379"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2033,81 +1310,54 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1398"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1398"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1403"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1403"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1408"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1408"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1413"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1413"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1418"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1418"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1423"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1423"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1428"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1428"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1462"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1462"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1462"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2722"/>
         <source>Compass gain</source>
         <translation>Resolução da bússola</translation>
@@ -2116,15 +1366,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1472"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2710"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3805"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1472"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2710"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3805"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1472"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2710"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2136,18 +1377,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1479"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2717"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3719"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1479"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2717"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3719"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1479"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2717"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3719"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1479"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2717"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3719"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2570"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2724"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2892"/>
@@ -2158,12 +1387,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1497"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2735"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1497"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2735"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1497"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2735"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1497"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2172,12 +1395,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1502"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2740"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1502"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2740"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1502"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2740"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1502"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2187,15 +1404,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1507"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2745"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1507"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2745"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1507"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2206,15 +1414,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1512"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2750"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1512"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2750"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1512"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2224,12 +1423,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1520"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2758"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1520"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2758"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1520"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2758"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1520"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2237,9 +1430,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1531"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1531"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1531"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1531"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2731"/>
         <source>2s</source>
         <translation>2 s</translation>
@@ -2247,12 +1437,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1536"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3775"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1536"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3775"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1536"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3775"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1536"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2261,12 +1445,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="359"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1544"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1544"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1544"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1544"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2573"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2734"/>
         <source>Sampling rate</source>
@@ -2275,12 +1453,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1555"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2769"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1555"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2769"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1555"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2769"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1555"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2289,12 +1461,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1560"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2774"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1560"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2774"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1560"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2774"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1560"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2303,12 +1469,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1565"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2779"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1565"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2779"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1565"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2779"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1565"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2317,12 +1477,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1570"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2784"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1570"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2784"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1570"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2784"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1570"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2332,15 +1486,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="417"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1578"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2792"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1578"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2792"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1578"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2792"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1578"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2792"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2579"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2740"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2904"/>
@@ -2350,12 +1495,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1585"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2799"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1585"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2799"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1585"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2799"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1585"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2365,15 +1504,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="345"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1595"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2809"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="345"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1595"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2809"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="345"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1595"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2383,12 +1513,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="470"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1602"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1602"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1602"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2398,15 +1522,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1628"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2835"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1628"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2835"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1628"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2417,15 +1532,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="463"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1635"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2842"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="463"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1635"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2842"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="463"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1635"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2842"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="463"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1635"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2842"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2582"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2746"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2909"/>
@@ -2435,12 +1541,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1642"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1642"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1642"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1642"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2584"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2747"/>
         <source>Reset Depth</source>
@@ -2450,15 +1550,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="573"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1719"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2875"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="573"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1719"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2875"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="573"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1719"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2875"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="573"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1719"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2875"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2621"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2790"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2944"/>
@@ -2467,9 +1558,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1725"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1725"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1725"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1725"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2752"/>
         <source>Left button sensitivity</source>
         <translation>Sensibilidade do botão esquerdo</translation>
@@ -2477,12 +1565,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1732"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3167"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1732"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1732"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1732"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2491,12 +1573,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1739"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1739"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1739"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1739"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2590"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2754"/>
         <source>Alt GF can be selected underwater</source>
@@ -2506,15 +1582,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="596"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1746"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2911"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="596"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1746"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2911"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="596"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1746"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2911"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="596"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1746"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2911"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2592"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2755"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2915"/>
@@ -2524,12 +1591,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2918"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2918"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2918"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2539,15 +1600,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="815"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1760"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2925"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="815"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1760"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2925"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="815"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1760"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2558,15 +1610,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="792"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1783"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2948"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="792"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1783"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2948"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="792"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1783"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2576,12 +1619,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="586"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1806"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1806"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1806"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2591,15 +1628,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="645"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1858"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2984"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="645"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1858"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2984"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="645"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1858"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2984"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="645"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1858"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2984"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2595"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2764"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2922"/>
@@ -2610,15 +1638,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="656"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1901"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3024"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1901"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3024"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1901"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3024"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1901"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3024"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2596"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2767"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2925"/>
@@ -2628,12 +1647,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1906"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3029"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1906"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3029"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1906"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3029"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1906"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2643,15 +1656,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="723"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1924"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3052"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1924"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3052"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1924"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3052"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1924"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3052"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2606"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2771"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2930"/>
@@ -2662,15 +1666,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="749"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1950"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3062"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="749"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3062"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="749"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3062"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="749"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3062"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2608"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2773"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2931"/>
@@ -2681,15 +1676,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="775"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1976"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3085"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="775"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1976"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3085"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="775"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1976"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3085"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="775"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1976"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3085"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2610"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2775"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2933"/>
@@ -2699,12 +1685,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="782"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1983"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="782"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1983"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="782"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1983"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="782"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1983"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2611"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2776"/>
         <source>Saturation</source>
@@ -2712,27 +1692,18 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1993"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1993"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1993"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1993"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2777"/>
         <source>Flip screen</source>
         <translation>Inverter ecrã</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2000"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2000"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2000"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2000"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2778"/>
         <source>Right button sensitivity</source>
         <translation>Sensibilidade do botão direito</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2007"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2007"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2007"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2007"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2779"/>
         <source>MOD warning</source>
         <translation>Aviso MOD</translation>
@@ -2740,12 +1711,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="838"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2014"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="838"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2014"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="838"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2014"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="838"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2014"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2616"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2780"/>
         <source>Graphical speed indicator</source>
@@ -2753,9 +1718,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2021"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2021"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2021"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2021"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2781"/>
         <source>Dynamic ascent rate</source>
         <translation>Velocidade de subida dinâmica</translation>
@@ -2764,15 +1726,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="877"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2028"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3092"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2028"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3092"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2028"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3092"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2028"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3092"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2619"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2782"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2934"/>
@@ -2783,15 +1736,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="884"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2035"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3099"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="884"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2035"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3099"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="884"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2035"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3099"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="884"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2035"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3099"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2620"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2783"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2935"/>
@@ -2801,12 +1745,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2106"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3194"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2106"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3194"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2106"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3194"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2106"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2815,12 +1753,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2113"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3201"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2113"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3201"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2113"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3201"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2113"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2830,15 +1762,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="892"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2133"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3221"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="892"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2133"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3221"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="892"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2133"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3221"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="892"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2133"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3221"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2687"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2865"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3018"/>
@@ -2847,18 +1770,12 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2874,36 +1791,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1652"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1677"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1699"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1845"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2852"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2971"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1652"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1677"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1699"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1845"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2852"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2971"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1652"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1677"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1699"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1845"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2852"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2925,27 +1812,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="845"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="861"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2090"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3106"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3122"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3138"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="845"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="861"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2090"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3106"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3122"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3138"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="845"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="861"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2090"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3106"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3122"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2963,24 +1829,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3264"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3349"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="935"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1020"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2176"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3264"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3349"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="935"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1020"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2176"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3264"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3349"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="935"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1020"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2176"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3264"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3349"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2623"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2646"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2792"/>
@@ -2997,24 +1845,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2266"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3269"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3354"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="940"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1025"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2266"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3269"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3354"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="940"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1025"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2266"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3269"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3354"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="940"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1025"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2266"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3269"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3354"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2625"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2648"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2794"/>
@@ -3031,24 +1861,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3274"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3359"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="945"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1030"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2186"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3274"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3359"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="945"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1030"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2186"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3274"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3359"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="945"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1030"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2186"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3274"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3359"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2627"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2650"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2796"/>
@@ -3068,33 +1880,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3279"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3364"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3439"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1035"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1100"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2191"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2276"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3279"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3364"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3439"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1035"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1100"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2191"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2276"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3279"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3364"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3439"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1035"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1100"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2191"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2276"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3279"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3364"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3439"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2629"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2652"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2671"/>
@@ -3111,15 +1896,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="955"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2196"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3284"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2196"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3284"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2196"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3284"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2196"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3284"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2634"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2803"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2957"/>
@@ -3130,15 +1906,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2201"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3289"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2201"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3289"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2201"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3289"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2201"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3289"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2636"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2805"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2959"/>
@@ -3149,15 +1916,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3294"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3294"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3294"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3294"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2638"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2807"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2961"/>
@@ -3168,15 +1926,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="970"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2211"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3299"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="970"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2211"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3299"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="970"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2211"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3299"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="970"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2211"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3299"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2640"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2809"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2963"/>
@@ -3187,15 +1936,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="975"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2216"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3304"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="975"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2216"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3304"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="975"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2216"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3304"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="975"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2216"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3304"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2642"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2811"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2965"/>
@@ -3206,15 +1946,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1040"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2281"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3369"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1040"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2281"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3369"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1040"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2281"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3369"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1040"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2281"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3369"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2657"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2826"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2980"/>
@@ -3225,15 +1956,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1045"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2286"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3374"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1045"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2286"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3374"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1045"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2286"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3374"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1045"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2286"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3374"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2659"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2828"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2982"/>
@@ -3244,15 +1966,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1050"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2291"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3379"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1050"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2291"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3379"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1050"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2291"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3379"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1050"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2291"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3379"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2661"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2830"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2984"/>
@@ -3263,15 +1976,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1055"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2296"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3384"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1055"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2296"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3384"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1055"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2296"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3384"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1055"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2296"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3384"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2663"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2832"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2986"/>
@@ -3282,15 +1986,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1060"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2301"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3389"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1060"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2301"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3389"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1060"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2301"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3389"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1060"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2301"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3389"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2665"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2834"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2988"/>
@@ -3301,15 +1996,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1095"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3434"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1095"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3434"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1095"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3434"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1095"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3434"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2669"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2838"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2992"/>
@@ -3320,15 +2006,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1105"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2356"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3444"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1105"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2356"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3444"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1105"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2356"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3444"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1105"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2356"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3444"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2676"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2845"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2999"/>
@@ -3339,15 +2016,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1110"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2361"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3449"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1110"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2361"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3449"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1110"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2361"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3449"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1110"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2361"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3449"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2678"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2847"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3001"/>
@@ -3358,15 +2026,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1115"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2366"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3454"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1115"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2366"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3454"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1115"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2366"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3454"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1115"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2366"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3454"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2680"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2849"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3003"/>
@@ -3380,24 +2039,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2450"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3509"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3525"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1136"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1152"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2450"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3509"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3525"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1136"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1152"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2450"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3509"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3525"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1136"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1152"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2450"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3509"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3525"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2683"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2684"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2861"/>
@@ -3410,12 +2051,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1884"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3007"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1884"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3007"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1884"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3007"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1884"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3007"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2766"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2924"/>
         <source>mbar</source>
@@ -3424,12 +2059,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2371"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3459"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2371"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3459"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2371"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3459"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2371"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3459"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2851"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3005"/>
         <source>SP 4</source>
@@ -3438,12 +2067,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2376"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3464"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2376"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3464"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2376"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3464"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2376"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3464"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2853"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3007"/>
         <source>SP 5</source>
@@ -3451,9 +2074,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2384"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2384"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2384"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2384"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2856"/>
         <source>O₂ in calibration gas</source>
         <translation>O₂ no gás de calibração</translation>
@@ -3461,12 +2081,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3473"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3473"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3473"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3473"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2858"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3010"/>
         <source>Fixed setpoint</source>
@@ -3475,12 +2089,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2413"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3478"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2413"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3478"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2413"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3478"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2413"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3478"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2859"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3011"/>
         <source>Sensor</source>
@@ -3488,9 +2096,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3486"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3486"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3486"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3486"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3013"/>
         <source>Setpoint fallback</source>
         <translation>Setpoint de recurso</translation>
@@ -3499,15 +2104,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1168"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2466"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3541"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1168"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2466"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3541"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1168"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2466"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -3518,15 +2114,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1175"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2473"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3548"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1175"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2473"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3548"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1175"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2473"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -3535,27 +2122,18 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3589"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3589"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3589"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3589"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3019"/>
         <source>Safety level</source>
         <translation>Nível de segurança</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3615"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3615"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3615"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3615"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3021"/>
         <source>Altitude range</source>
         <translation>Intervalo de altitude</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3622"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3622"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3622"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3622"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3022"/>
         <source>Model</source>
         <translation>Modelo</translation>
@@ -3563,12 +2141,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="338"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3642"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3642"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3642"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -3576,18 +2148,12 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3702"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3702"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3702"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3702"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3026"/>
         <source>Max. depth</source>
         <translation>Prof. Max.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3749"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3749"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3749"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3749"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3029"/>
         <source>P0 (none)</source>
         <extracomment>Suunto safety level</extracomment>
@@ -3595,9 +2161,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3754"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3754"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3754"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3754"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3030"/>
         <source>P1 (medium)</source>
         <extracomment>Suunto safety level</extracomment>
@@ -3605,9 +2168,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3759"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3759"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3759"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3759"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3031"/>
         <source>P2 (high)</source>
         <extracomment>Suunto safety level</extracomment>
@@ -3615,45 +2175,30 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3767"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3767"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3767"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3767"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3033"/>
         <source>Sample rate</source>
         <translation>Taxa de amostragem</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3780"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3780"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3780"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3780"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3035"/>
         <source>20s</source>
         <translation>20 s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3785"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3785"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3785"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3785"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3036"/>
         <source>30s</source>
         <translation>30 s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3790"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3790"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3790"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3790"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3037"/>
         <source>60s</source>
         <translation>60 s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3798"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3798"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3798"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3798"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3039"/>
         <source>Total dive time</source>
         <translation>Tempo total de mergulho</translation>
@@ -3664,21 +2209,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1914"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3042"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3822"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3914"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1914"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3042"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3822"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3914"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1914"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3042"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3822"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -3689,45 +2219,30 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3836"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3836"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3836"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3836"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3042"/>
         <source>24h</source>
         <translation>24 h</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3841"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3841"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3841"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3841"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3043"/>
         <source>12h</source>
         <translation>12 h</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3849"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3849"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3849"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3849"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3045"/>
         <source>Time format</source>
         <translation>Formato de hora</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3864"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3864"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3864"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3864"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3047"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3869"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3869"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3869"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3869"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3048"/>
         <source>Metric</source>
         <translation>Métrico</translation>
@@ -3737,18 +2252,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1612"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2819"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3880"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1612"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2819"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3880"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1612"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2819"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -3758,198 +2261,129 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3887"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3887"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3887"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3887"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3051"/>
         <source>Light</source>
         <translation>Leve</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3904"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3904"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3904"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3904"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3052"/>
         <source>Depth alarm</source>
         <translation>Alarme de profundidade</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3924"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3924"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3924"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3924"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3054"/>
         <source>Time alarm</source>
         <translation>Alarme de tempo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="399"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2575"/>
         <source>MM/DD/YY</source>
         <translation>MM/DD/AA</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="404"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2576"/>
         <source>DD/MM/YY</source>
         <translation>DD/MM/AA</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="409"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2577"/>
         <source>YY/MM/DD</source>
         <translation>AA/MM/DD</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2580"/>
         <source>Salinity</source>
         <translation>Salinidade</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="666"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="666"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="666"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2598"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 Circuito fechado</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="676"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="676"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="676"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="676"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2600"/>
         <source>L16-GF OC</source>
         <translation>L16-GF  - circuito aberto</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="681"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="681"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="681"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="681"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2601"/>
         <source>L16-GF CC</source>
         <translation>L16-GF Circuito fechado</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="686"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="686"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="686"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2881"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2881"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2881"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2912"/>
         <source>Travel gas consumption</source>
         <translation>Consumo da mistura de transição</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2904"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2904"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2904"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2904"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2914"/>
         <source>Button sensitivity</source>
         <translation>Sensibilidade dos botões</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3034"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3034"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3034"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3174"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3174"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3174"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2940"/>
         <source>VPM conservatism</source>
         <translation>Conservacionismo do VPM</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3181"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3181"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3181"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="895"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="895"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="895"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/>
         <source>Backup dive computer settings</source>
         <translation>Cópia de segurança das configurações do computador de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/>
         <source>Backup files</source>
         <translation>Ficheiros de backup</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/>
         <source>XML backup error</source>
         <translation>Erro na cópia de segurança XML</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Ocorreu um erro ao efectuar a cópia de segurança.
@@ -3957,41 +2391,26 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/>
         <source>Backup succeeded</source>
         <translation>Cópia de segurança efectuada com sucesso</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/>
         <source>Your settings have been saved to: %1</source>
         <translation>As suas configurações foram gravadas em: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/>
         <source>Restore dive computer settings</source>
         <translation>Restaurar configurações do computador de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/>
         <source>XML restore error</source>
         <translation>Erro ao restaurar XML</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Ocorreu um erro ao restaurar a cópia de segurança.
@@ -3999,73 +2418,46 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/>
         <source>Restore succeeded</source>
         <translation>Reposição efectuada com sucesso</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/>
         <source>Your settings have been restored successfully.</source>
         <translation>As suas definições foram restauradas com sucesso.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/>
         <source>Select firmware file</source>
         <translation>Seleccionar ficheiro de firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/>
         <source>All files</source>
         <translation>Todos os ficheiros</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/>
         <source>Log files</source>
         <translation>Ficheiros de registo de mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/>
         <source>Connecting to device...</source>
         <translation>A ligar ao dispositivo...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/>
         <source>Connected to device</source>
         <translation>Ligado ao dispositivo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/>
         <source>Disconnected from device</source>
         <translation>Desligado do dispositivo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
         <source>Choose file for dive computer download logfile</source>
         <translation>Seleccionar o ficheiro para descarregar o registo de mergulhos</translation>
     </message>
@@ -4142,162 +2534,95 @@
     </message>
 </context>
 <context>
-    <name>CreateTrip</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="707"/>
-        <source>create trip</source>
-        <translation>criar viagem</translation>
-    </message>
-</context>
-<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Size</source>
         <translation>Capacidade</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Work press.</source>
         <translation>Pressão de serviço</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../qt-models/cylindermodel.cpp" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="24"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="24"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="24"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="27"/>
         <source>Start press.</source>
         <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>End press.</source>
         <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>O₂%</source>
         <translation>%O₂</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Deco switch at</source>
         <translation>Troca de gás aos</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Bot. MOD</source>
         <translation>MOD</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>MND</source>
         <translation>MND</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Use</source>
         <translation>Utilização</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="52"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="54"/>
         <source>cuft</source>
         <translation>pé cúbico</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="56"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="58"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="247"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="238"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Ao clicar aqui irá eliminar esta garrafa.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="260"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="259"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="249"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation>Profundidade para a troca de gás. Calculada usando as preferências para a PpO₂, excepto se especificado manualmente.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="263"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="262"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="251"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max. depth.</source>
         <translation>Calculado usando a preferência para a pO₂ para a fase de fundo. Seleccionar a MOD ajusta a O₂%; ajustar para  &apos;*&apos; para obter a melhor O₂% para a profundidade máxima.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="265"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max. depth.</source>
         <translation>Calculado usando a preferência &quot;END da mistura ideal&quot;. Seleccionar a MND ajusta a He%; ajustar para  &apos;*&apos; para obter a melhor He% para a profundidade máxima.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="245"/>
+        <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>Este gás está a ser usado. Apenas podem ser removidas as garrafas que não foram usadas durante o mergulho.</translation>
     </message>
@@ -4305,66 +2630,56 @@
 <context>
     <name>DiveComponentSelection</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="486"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="499"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
         <source>Dive site: </source>
         <translation>Local de mergulho:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="501"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
         <source>Dive master: </source>
         <translation>Guia de mergulho:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="503"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
         <source>Buddy: </source>
         <translation>Companheiro:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="505"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="494"/>
         <source>Rating: </source>
         <translation>Classificação:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="494"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="507"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="496"/>
         <source>Visibility: </source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="509"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="498"/>
         <source>Notes:
 </source>
         <translation>Notas:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="511"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="500"/>
         <source>Suit: </source>
         <translation>Fato:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="513"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
         <source>Tags: </source>
         <translation>Categorias:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="523"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="512"/>
         <source>Cylinders:
 </source>
         <translation>Garrafas:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="531"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/>
         <source>Weights:
 </source>
         <translation>Lastro:
@@ -4375,118 +2690,81 @@
     <name>DiveComponentSelectionDialog</name>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="23"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="139"/>
         <source>Component selection</source>
         <translation>Selecção de componentes</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="52"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="140"/>
         <source>Which components would you like to copy</source>
         <translation>Quais os componentes que deseja copiar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="141"/>
         <source>Dive site</source>
         <translation>Local de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="129"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="115"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="73"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="145"/>
         <source>Tags</source>
         <translation>Categorias</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="52"/>
         <source>Which components would you like to copy?</source>
         <translation>Quais os componentes que deseja copiar?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="146"/>
         <source>Weights</source>
         <translation>Lastro</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="101"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="147"/>
         <source>Cylinders</source>
         <translation>Garrafas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="122"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="148"/>
         <source>Divemaster</source>
         <translation>Guia de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="146"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="146"/>
         <source>You can paste these to another dive or as text to another application.</source>
         <translation>Pode colar estes a outro mergulho ou como texto noutra aplicação.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="108"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="149"/>
         <source>Buddy</source>
         <translation>Companheiros</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="136"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="150"/>
         <source>Rating</source>
         <translation>Classificação</translation>
@@ -4496,26 +2774,17 @@
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomputermanagementdialog.h" line="65"/>
         <source>Edit dive computer nicknames</source>
         <translation>Editar nome do computador de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomputermanagementdialog.cpp" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomputermanagementdialog.cpp" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomputermanagementdialog.cpp" line="42"/>
         <source>Remove the selected dive computer?</source>
         <translation>Remover o computador de mergulho seleccionado?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomputermanagementdialog.cpp" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomputermanagementdialog.cpp" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomputermanagementdialog.cpp" line="43"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Tem a certeza que deseja
@@ -4526,33 +2795,21 @@ remover o computador de mergulho seleccionado?</translation>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divecomputermodel.cpp" line="9"/>
         <source>Model</source>
         <translation>Modelo</translation>
     </message>
     <message>
         <location filename="../qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divecomputermodel.cpp" line="9"/>
         <source>Device ID</source>
         <translation>ID do dispositivo</translation>
     </message>
     <message>
         <location filename="../qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divecomputermodel.cpp" line="9"/>
         <source>Nickname</source>
         <translation>Alcunha</translation>
     </message>
     <message>
         <location filename="../qt-models/divecomputermodel.cpp" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divecomputermodel.cpp" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divecomputermodel.cpp" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divecomputermodel.cpp" line="36"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Ao clicar aqui irá remover este computador de mergulho.</translation>
     </message>
@@ -4561,49 +2818,31 @@ remover o computador de mergulho seleccionado?</translation>
     <name>DiveDetails</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetails.qml" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetails.qml" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetails.qml" line="55"/>
         <source>Dive details</source>
         <translation>Detalhes do mergulho</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetails.qml" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetails.qml" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetails.qml" line="150"/>
         <source>Delete dive</source>
         <translation>Eliminar mergulho</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetails.qml" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetails.qml" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetails.qml" line="167"/>
         <source>Cancel edit</source>
         <translation>Cancelar edições</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetails.qml" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetails.qml" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetails.qml" line="177"/>
         <source>Show on map</source>
         <translation>Mostrar no mapa</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetails.qml" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetails.qml" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetails.qml" line="192"/>
         <source>Save edits</source>
         <translation>Gravar as alterações</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetails.qml" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetails.qml" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetails.qml" line="192"/>
         <source>Edit dive</source>
         <translation>Editar mergulho</translation>
     </message>
@@ -4612,41 +2851,26 @@ remover o computador de mergulho seleccionado?</translation>
     <name>DiveDetailsEdit</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="158"/>
         <source>Dive %1</source>
         <translation>Mergulho %1</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="162"/>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="174"/>
         <source>Location:</source>
         <translation>Local:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/>
         <source>Coordinates:</source>
         <translation>Coordenadas:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/>
         <source>Use current
 GPS location:</source>
         <translation>Usar a localização
@@ -4654,73 +2878,46 @@ do GPS actual:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Depth:</source>
         <translation>Profundidade:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="244"/>
         <source>Duration:</source>
         <translation>Duração:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="258"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="258"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="258"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="258"/>
         <source>Air Temp:</source>
         <translation>Temperatura do ar:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="271"/>
         <source>Water Temp:</source>
         <translation>Temperatura da água:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="284"/>
         <source>Suit:</source>
         <translation>Fato:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/>
         <source>Buddy:</source>
         <translation>Companheiros:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="325"/>
         <source>Divemaster:</source>
         <translation>Guia:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/>
         <source>Weight:</source>
         <translation>Peso:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="360"/>
         <source>Cylinder1:</source>
         <translation>Garrafa 1:</translation>
     </message>
@@ -4730,21 +2927,6 @@ do GPS actual:</translation>
         <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="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="632"/>
         <source>Gas mix:</source>
         <translation>Mistura respiratória:</translation>
     </message>
@@ -4754,21 +2936,6 @@ do GPS actual:</translation>
         <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="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="451"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="649"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="451"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="649"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="451"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="649"/>
         <source>Start Pressure:</source>
         <translation>Pressão inicial:</translation>
     </message>
@@ -4778,77 +2945,41 @@ do GPS actual:</translation>
         <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="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="467"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="599"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="665"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="467"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="599"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="665"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="467"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="599"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="665"/>
         <source>End Pressure:</source>
         <translation>Pressão final:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="418"/>
         <source>Cylinder2:</source>
         <translation>Garrafa 2:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="483"/>
         <source>Cylinder3:</source>
         <translation>Garrafa 3:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="549"/>
         <source>Cylinder4:</source>
         <translation>Garrafa 4:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="615"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="615"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="615"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="615"/>
         <source>Cylinder5:</source>
         <translation>Garrafa 5:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="680"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="680"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="680"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="680"/>
         <source>Rating:</source>
         <translation>Classificação:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="693"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="693"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="693"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="693"/>
         <source>Visibility:</source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="707"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
@@ -4857,105 +2988,66 @@ do GPS actual:</translation>
     <name>DiveDetailsView</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="228"/>
         <source>No profile to show</source>
         <translation>Não existe perfil para mostrar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="234"/>
         <source>Suit:</source>
         <translation>Fato:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="240"/>
         <source>Air Temp:</source>
         <translation>Temperatura do ar:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="284"/>
         <source>Cylinder:</source>
         <translation>Garrafa:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="246"/>
         <source>Water Temp:</source>
         <translation>Temperatura da água:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
         <source>Map it</source>
         <translation>Mapear</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="112"/>
         <source>Rating:</source>
         <translation>Classificação:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="155"/>
         <source>Visibility:</source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="337"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="337"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="337"/>
         <source>Divemaster:</source>
         <translation>Guia:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
         <source>Weight:</source>
         <translation>Peso:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="344"/>
         <source>Buddy:</source>
         <translation>Companheiros:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
         <source>SAC:</source>
         <translation>Consumo:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="380"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
@@ -4963,59 +3055,38 @@ do GPS actual:</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="184"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="187"/>
         <source> (cyl. %1)</source>
         <translation>(garr. %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="188"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
         <source>ICD</source>
         <translation>ICD</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="189"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="189"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="189"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
         <source>ΔHe</source>
         <translation>ΔHe</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="190"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="193"/>
         <source>ΔN₂</source>
         <translation>ΔN₂</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="211"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="214"/>
         <source>Manual switch to OC</source>
         <translation>Mudança manual para circuito aberto</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="213"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>iniciar</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="214"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="217"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>fim</translation>
@@ -5024,42 +3095,27 @@ do GPS actual:</translation>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveimportedmodel.cpp" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveimportedmodel.cpp" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveimportedmodel.cpp" line="39"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="38"/>
         <source>Date/time</source>
         <translation>Data e hora</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveimportedmodel.cpp" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveimportedmodel.cpp" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveimportedmodel.cpp" line="41"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="40"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveimportedmodel.cpp" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveimportedmodel.cpp" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveimportedmodel.cpp" line="43"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="42"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveimportedmodel.cpp" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveimportedmodel.cpp" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveimportedmodel.cpp" line="78"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveimportedmodel.cpp" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveimportedmodel.cpp" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveimportedmodel.cpp" line="78"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -5069,68 +3125,41 @@ do GPS actual:</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="340"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="340"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="340"/>
         <source>Dive list</source>
         <translation>Lista de mergulhos</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="428"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="346"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="346"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="346"/>
         <source>Cloud credentials</source>
         <translation>Credenciais da nuvem</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="363"/>
         <source>Please wait, filtering dive list</source>
         <translation>Por favor espere; a filtrar a lista de mergulhos</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="478"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="478"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="478"/>
         <source>Download dives</source>
         <translation>Descarregar mergulhos</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="570"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="488"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="488"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="488"/>
         <source>Add dive</source>
         <translation>Adicionar mergulho</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="580"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="498"/>
         <source>Filter dives</source>
         <translation>Filtrar mergulhos</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="424"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="342"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="342"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="342"/>
         <source>Please tap the &apos;+&apos; button to add a dive (or download dives from a supported dive computer)</source>
         <translation>Por favor toque no botão &apos;+&apos; para adicionar um mergulho (ou para descarregar mergulhos de um computador de mergulho)</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="363"/>
         <source>No dives in dive list</source>
         <translation>Não existem mergulhos na lista de mergulhos</translation>
     </message>
@@ -5138,12 +3167,12 @@ do GPS actual:</translation>
 <context>
     <name>DiveListSortModel</name>
     <message numerus="yes">
-        <location filename="../qt-models/divelistmodel.cpp" line="107"/>
+        <location filename="../qt-models/divelistmodel.cpp" line="108"/>
         <source>(%n dive(s))</source>
         <translation><numerusform>(%1 mergulho)</numerusform><numerusform>(%n mergulhos)</numerusform></translation>
     </message>
     <message>
-        <location filename="../qt-models/divelistmodel.cpp" line="109"/>
+        <location filename="../qt-models/divelistmodel.cpp" line="110"/>
         <source>(%L1 shown)</source>
         <translation>(%L1 mostrados)</translation>
     </message>
@@ -5151,186 +3180,117 @@ do GPS actual:</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="905"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="875"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="875"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="875"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="912"/>
         <source>Expand all</source>
         <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="907"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="914"/>
         <source>Collapse all</source>
         <translation>Colapsar todos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="911"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="881"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="881"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="881"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="918"/>
         <source>Collapse others</source>
         <translation>Colapsar outros</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="915"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="885"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="885"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="885"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
         <source>Remove dive(s) from trip</source>
         <translation>Remover mergulho(s) desta viagem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="916"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="886"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="886"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="886"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="923"/>
         <source>Create new trip above</source>
         <translation>Criar uma nova viagem acima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="931"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="901"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="901"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="901"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="938"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Adicionar mergulho(s) à viagem imediatamente acima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="933"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="903"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="903"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="903"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="940"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Adicionar mergulho(s) à viagem imediatamente abaixo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="937"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="907"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="907"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="907"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
         <source>Merge trip with trip above</source>
         <translation>Juntar esta viagem com a viagem acima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="938"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="908"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="908"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="908"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="945"/>
         <source>Merge trip with trip below</source>
         <translation>Juntar esta viagem com a viagem abaixo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="942"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="912"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="912"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="912"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="949"/>
         <source>Delete dive(s)</source>
         <translation>Eliminar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="914"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="914"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="914"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="951"/>
         <source>Mark dive(s) invalid</source>
         <translation>Marcar mergulho(s) como inválido(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="948"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="918"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="918"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="918"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="955"/>
         <source>Merge selected dives</source>
         <translation>Juntar os mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="920"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="920"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="920"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
         <source>Renumber dive(s)</source>
         <translation>Renumerar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="951"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="921"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="921"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="921"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
         <source>Shift dive times</source>
         <translation>Deslocar os tempos de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="952"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="922"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="922"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="922"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
         <source>Split selected dives</source>
         <translation>Dividir os mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="953"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="923"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="923"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="923"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
         <source>Load media from file(s)</source>
         <translation>Carregar ficheiros multimedia a partir do(s) ficheiro(s)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="954"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="924"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="924"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="924"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="961"/>
         <source>Load media from web</source>
         <translation>Carregar ficheiros multimédia a partir da internet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="980"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="950"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="987"/>
         <source>Open media files</source>
         <translation>Abrir ficheiros multimedia:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="983"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="953"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="953"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="953"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
         <source>Media files</source>
         <translation>Ficheiros multimedia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="984"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="954"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="954"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="954"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
         <source>Image files</source>
         <translation>Ficheiros de imagem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="985"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="955"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
         <source>Video files</source>
         <translation>Ficheiros vídeo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="986"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="956"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="956"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="956"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="993"/>
         <source>All files</source>
         <translation>Todos os ficheiros</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="1035"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="1012"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="1012"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="1012"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="1042"/>
         <source>%1 does not appear to be an image</source>
         <translation>%1 não parece ser uma imagem</translation>
     </message>
@@ -5338,18 +3298,12 @@ do GPS actual:</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../desktop-widgets/locationinformation.cpp" line="326"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="390"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Criar um novo local de mergulho, copiando a informação relevante do mergulho actual.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/locationinformation.cpp" line="327"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="391"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Criar um novo local de mergulho com este nome</translation>
     </message>
@@ -5358,117 +3312,78 @@ do GPS actual:</translation>
     <name>DiveLogExportDialog</name>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="372"/>
         <source>Export dive log files</source>
         <translation>Exportar registo de mergulho para ficheiro</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="44"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="392"/>
         <source>General export</source>
         <translation>Definições</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="103"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="374"/>
         <source>Export format</source>
         <translation>Exportar formato</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="198"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="375"/>
         <source>Subsurface &amp;XML</source>
         <translation>&amp;XML do Subsurface</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="134"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="376"/>
         <source>UDDF</source>
         <translation>UDDF</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="377"/>
         <source>di&amp;velogs.de</source>
         <translation>di&amp;velogs.de</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="157"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="378"/>
         <source>DiveShare</source>
         <translation>DiveShare</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="260"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="167"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="379"/>
         <source>CSV dive profile</source>
         <translation>Perfil de mergulho CSV</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="177"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="380"/>
         <source>CSV dive details</source>
         <translation>Detalhes de mergulho em CSV</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="290"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="197"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="381"/>
         <source>Worldmap</source>
         <translation>Mapa mundo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="300"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="207"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="382"/>
         <source>TeX</source>
         <translation>TeX</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="217"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="383"/>
         <source>I&amp;mage depths</source>
         <translation>Profundidade das I&amp;magens</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="263"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="384"/>
         <source>Selection</source>
         <translation>Selecção</translation>
@@ -5476,12 +3391,6 @@ do GPS actual:</translation>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="117"/>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="372"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="372"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="382"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="385"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="395"/>
         <source>Selected dives</source>
@@ -5489,45 +3398,30 @@ do GPS actual:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="282"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="386"/>
         <source>All dives</source>
         <translation>Todos os mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="285"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="285"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="295"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="387"/>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="311"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="388"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="316"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="389"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="330"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="391"/>
         <source>Anonymize</source>
         <translation>Tornar anónimo</translation>
@@ -5539,7 +3433,6 @@ do GPS actual:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="280"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="187"/>
         <source>Dive profile</source>
         <translation>Perfil de mergulho</translation>
     </message>
@@ -5555,423 +3448,277 @@ do GPS actual:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="372"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="342"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="415"/>
         <source>HTML</source>
         <translation>HTML</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="350"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="350"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="360"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="393"/>
         <source>General settings</source>
         <translation>Definições Gerais</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="356"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="356"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="366"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="394"/>
         <source>Subsurface numbers</source>
         <translation>Números do Subsurface</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="425"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="396"/>
         <source>Export yearly statistics</source>
         <translation>Exportar estatísticas anuais</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="401"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="401"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="411"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="397"/>
         <source>All di&amp;ves</source>
         <translation>Todos os me&amp;rgulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="451"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="421"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="398"/>
         <source>Export list only</source>
         <translation>Exportar apenas a lista</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="458"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="428"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="399"/>
         <source>Export photos</source>
         <translation>Exportar fotos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="444"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="400"/>
         <source>Style options</source>
         <translation>Opções de estilo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="489"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="449"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="449"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="401"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="499"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="459"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="459"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="402"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="480"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="403"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="475"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="475"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="485"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="404"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="520"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="480"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="480"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="490"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="405"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="406"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="530"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="490"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="490"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="500"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="407"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="505"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="408"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="540"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="510"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="409"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="548"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="508"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="508"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="518"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="411"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="559"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="529"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="112"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="115"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="105"/>
         <source>Light</source>
         <translation>Leve</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="524"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="524"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="534"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="413"/>
         <source>Sand</source>
         <translation>Areia</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Formato de uso genérico para trocar dados entre vários programas relacionados com o mergulho.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Valores separados por vírgulas que descrevem o perfil do mergulho.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="84"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="84"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Valores separados por vírgulas que descrevem dados sobre o mergulho. Incluem a maior parte dos dados de mergulho mas não informações sobre o perfil.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Enviar dados de mergulho para o sítio da web do divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
         <source>Send the dive data to dive-share.appspot.com website.</source>
         <translation>Enviar dados de mergulho para o sítio dive-share.appspot.com.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="90"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Exportar HTML dos locais de mergulho, visualizados num mapa mundo.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
         <source>Subsurface native XML format.</source>
         <translation>Formato XML nativo do Subsurface.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
         <source>Subsurface dive sites native XML format.</source>
         <translation>Formato XML nativo do Subsurface para os locais de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="94"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
         <source>Write depths of images to file.</source>
         <translation>Grava a profundidade a que foi obtida cada imagem para um ficheiro de texto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="96"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
         <source>Write dive as TeX macros to file.</source>
         <translation>Exportar o mergulho como macros TeX para o ficheiro.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="101"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
         <source>Write dive as LaTeX macros to file.</source>
         <translation>Exportar o mergulho como macros TeX para o ficheiro.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="98"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
         <source>Write the profile image as PNG file.</source>
         <translation>Gravar imagem do perfil de mergulho como ficheiro PNG.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="105"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="108"/>
         <source>Write profile data to a CSV file.</source>
         <translation>Gravar dados do perfil de mergulho para um ficheiro CSV.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="136"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
         <source>Export UDDF file as</source>
         <translation>Exportar ficheiro UDDF como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
         <source>UDDF files</source>
         <translation>Ficheiros UDDF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="145"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/>
         <source>CSV files</source>
         <translation>Ficheiros CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="180"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="203"/>
         <source>HTML files</source>
         <translation>Ficheiros HTML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="164"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="157"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Subsurface files</source>
         <translation>Ficheiros do Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="175"/>
         <source>Export Subsurface dive sites XML</source>
         <translation>Exportar XML do Subsurface com os locais de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="185"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>TeX files</source>
         <translation>Ficheiros TeX</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="144"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
         <source>Export CSV file as</source>
         <translation>Exportar ficheiro CSV como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="151"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/>
         <source>Export world map</source>
         <translation>Exportar mapa mundo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="156"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Export Subsurface XML</source>
         <translation>Exportar XML do Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="181"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="165"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
         <source>Save image depths</source>
         <translation>Gravar profundidades das imagens</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="185"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>Export to TeX file</source>
         <translation>Exportar para um ficheiro TeX</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="189"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="173"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Save profile image</source>
         <translation>Gravar imagem do perfil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="196"/>
         <source>Save profile data</source>
         <translation>Gravar dados do perfil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="199"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="179"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="202"/>
         <source>Export HTML files as</source>
         <translation>Exportar ficheiros HTML como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="193"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="216"/>
         <source>Please wait, exporting...</source>
         <translation>A exportar. Por favor aguarde...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="248"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="481"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="433"/>
+        <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>Não é possível abrir o ficheiro %s</translation>
     </message>
@@ -5980,688 +3727,372 @@ do GPS actual:</translation>
     <name>DiveLogImportDialog</name>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="157"/>
         <source>Import dive log file</source>
         <translation>Importar ficheiro de livro de registos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="158"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.aaaa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="94"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="159"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/dd/aaaa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="99"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="160"/>
         <source>yyyy-mm-dd</source>
         <translation>aaaa-mm-dd</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="162"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="113"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="163"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="118"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="164"/>
         <source>Minutes:seconds</source>
         <translation>Minutos:segundos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="127"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="166"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="132"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="167"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="155"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="169"/>
         <source>Drag the tags above to each corresponding column below</source>
         <translation>Arraste as etiquetas acima para cada uma das colunas abaixo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="374"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="580"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="577"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="577"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="577"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="375"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="581"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="647"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Alguns cabeçalhos foram previamente preenchidos; por favor arraste e largue os cabeçalhos de modo a que correspondam às colunas em questão.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="688"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="812"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="938"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="809"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="931"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="809"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="931"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="809"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="689"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="813"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
         <source>Sample time</source>
         <translation>Hora</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="690"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="687"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="811"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="687"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="811"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="687"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="811"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="691"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="815"/>
         <source>Sample depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="692"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="816"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="689"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="813"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="689"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="813"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="689"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="813"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="693"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="817"/>
         <source>Sample temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="694"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="818"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="691"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="815"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="691"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="815"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="691"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="815"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="695"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="819"/>
         <source>Sample pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="696"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="820"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="693"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="817"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="693"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="817"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="693"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="817"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="697"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="821"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Amostrar o sensor de pO₂ #1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="698"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="822"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="819"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="819"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="819"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="699"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="823"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Amostrar o sensor de pO₂ #2</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="700"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="824"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="697"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="821"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="697"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="821"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="697"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="821"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="701"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="825"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Amostrar o sensor de pO₂ #3</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="702"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="826"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="823"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="823"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="823"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="703"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="827"/>
         <source>Sample CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="704"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="828"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="701"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="825"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="701"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="825"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="701"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="825"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="705"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="829"/>
         <source>Sample NDL</source>
         <translation>NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="706"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="830"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="703"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="827"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="703"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="827"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="703"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="827"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="707"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="831"/>
         <source>Sample TTS</source>
         <translation>TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="708"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="832"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="705"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="829"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="705"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="829"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="705"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="829"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="709"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="833"/>
         <source>Sample stopdepth</source>
         <translation>Profundidade da paragem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="710"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="834"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="831"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="831"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="831"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="711"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="835"/>
         <source>Sample pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="712"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="838"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="709"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="833"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="709"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="833"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="709"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="833"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="713"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="839"/>
         <source>Sample setpoint</source>
         <translation>Amostrar o setpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="716"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="810"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="942"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="713"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="807"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="935"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="713"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="807"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="935"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="713"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="807"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="717"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="811"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
         <source>Dive #</source>
         <translation>Mergulho #</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="717"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="944"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="714"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="801"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="937"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="714"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="801"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="937"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="714"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="801"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="718"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="805"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="718"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="808"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="946"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="715"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="805"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="939"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="715"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="805"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="939"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="715"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="805"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="719"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="809"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="719"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="948"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="716"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="941"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="716"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="941"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="716"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="720"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="720"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="954"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="717"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="947"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="717"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="947"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="717"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="721"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
         <source>Max. depth</source>
         <translation>Prof. Max.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="721"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="956"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="718"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="949"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="718"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="949"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="718"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="722"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="957"/>
         <source>Avg. depth</source>
         <translation>Prof. Média</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="722"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="988"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="719"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="981"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="719"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="981"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="719"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="981"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="989"/>
         <source>Air temp.</source>
         <translation>Temp. do ar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="990"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="720"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="983"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="720"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="983"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="720"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="983"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="724"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="991"/>
         <source>Water temp.</source>
         <translation>Temp. da água</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="724"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="978"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="721"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="971"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="721"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="971"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="721"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="725"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="979"/>
         <source>Cyl. size</source>
         <translation>Tamanho da garrafa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="725"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="980"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="973"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="973"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="726"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="981"/>
         <source>Start pressure</source>
         <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="726"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="982"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="975"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="975"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="983"/>
         <source>End pressure</source>
         <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="984"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="724"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="977"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="724"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="977"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="724"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="728"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="985"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="728"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="986"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="725"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="979"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="725"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="979"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="725"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="979"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="987"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="726"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="943"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="726"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="943"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="726"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="730"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="730"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="952"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="945"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="945"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="958"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="728"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="951"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="728"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="951"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="728"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="732"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="959"/>
         <source>Divemaster</source>
         <translation>Guia de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="732"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="960"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="953"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="953"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="961"/>
         <source>Buddy</source>
         <translation>Companheiros</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="962"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="730"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="730"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="730"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="734"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="963"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="734"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="842"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="994"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="987"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="987"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="987"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="843"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="995"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="840"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="992"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="732"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="835"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="985"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="732"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="835"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="985"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="732"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="835"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="985"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="736"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="841"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="993"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="736"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="964"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="957"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="957"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="957"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="966"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="959"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="959"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="959"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="738"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="738"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="968"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="961"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="961"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="961"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>Tags</source>
         <translation>Categorias</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="836"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="837"/>
         <source>Sample heartrate</source>
         <translation>Fre</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="1019"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="1020"/>
         <source>multiple files</source>
         <translation>múltiplos ficheiros</translation>
     </message>
 </context>
 <context>
-    <name>DiveObjectHelper</name>
-    <message numerus="yes">
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurface-qt/DiveObjectHelper.cpp" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurface-qt/DiveObjectHelper.cpp" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurface-qt/DiveObjectHelper.cpp" line="344"/>
-        <source>(%n dive(s))</source>
-        <translation><numerusform>(%n mergulho)</numerusform><numerusform>(%n mergulhos)</numerusform></translation>
-    </message>
-</context>
-<context>
     <name>DivePlanner</name>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="74"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="201"/>
         <source>Planned dive time</source>
         <translation>Data e hora </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="117"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="202"/>
         <source>Altitude</source>
         <translation>Altitude</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="124"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="203"/>
         <source>ATM pressure</source>
         <translation>Pressão atmosférica</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="166"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="166"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="166"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="144"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="144"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="205"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="131"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="204"/>
         <source>Water type</source>
         <translation>Tipo de água</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="180"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="207"/>
         <source>Fresh water</source>
         <translation>Água doce</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="185"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="185"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="185"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="185"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="208"/>
         <source>Sea water</source>
         <translation>Água salgada</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="190"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="209"/>
         <source>EN13319</source>
         <translation>EN13319</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="195"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="210"/>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="221"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="215"/>
         <source>kg/ℓ</source>
         <translation>kg/ℓ</translation>
@@ -6670,98 +4101,62 @@ do GPS actual:</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="171"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="171"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="171"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="171"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="173"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="272"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="274"/>
         <source>cyl.</source>
         <translation>garr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="378"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
         <source>Final depth</source>
         <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="380"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
         <source>Run time</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="382"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="382"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="382"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="384"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="384"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="384"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
         <source>Used gas</source>
         <translation>Gás usado</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="386"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
         <source>CC setpoint</source>
         <translation>Setpoint Circuito fechado</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="388"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="390"/>
         <source>Dive mode</source>
         <translation>Modo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1026"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="1020"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="1020"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="1020"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1028"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1032"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="1026"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="1026"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="1026"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1034"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1035"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="1029"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="1029"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="1029"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1037"/>
         <source>ft</source>
         <translation>pé</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1082"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="1076"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="1076"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="1076"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1084"/>
         <source>Stop times</source>
         <translation>Tempos das paragens</translation>
     </message>
@@ -6770,49 +4165,31 @@ do GPS actual:</translation>
     <name>DivePlannerWidget</name>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="114"/>
         <source>Dive planner points</source>
         <translation>Pontos do plano de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="119"/>
         <source>Available gases</source>
         <translation>Gases disponíveis</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="120"/>
         <source>Add cylinder</source>
         <translation>Adicionar garrafa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="151"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="151"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="151"/>
         <source>Add dive data point</source>
         <translation>Adicionar ponto ao mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="161"/>
         <source>Save new</source>
         <translation>Gravar novo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="266"/>
         <source>kg/ℓ</source>
         <translation>kg/ℓ</translation>
     </message>
@@ -6821,169 +4198,106 @@ do GPS actual:</translation>
     <name>DivePlotDataModel</name>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="114"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="116"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="118"/>
         <source>Pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="120"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="122"/>
         <source>Color</source>
         <translation>Côr</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="124"/>
         <source>User entered</source>
         <translation>Inserido pelo utilizador</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="126"/>
         <source>Pressure S</source>
         <translation>Pressão S</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure I</source>
         <translation>Pressão I</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="130"/>
         <source>Ceiling</source>
         <translation>Tecto</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="132"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="134"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="138"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="140"/>
         <source>Setpoint</source>
         <translation>Setpoint fixo</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="142"/>
         <source>Sensor 1</source>
         <translation>Sensor 1</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="144"/>
         <source>Sensor 2</source>
         <translation>Sensor 2</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="146"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="146"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="146"/>
         <source>Sensor 3</source>
         <translation>Sensor 3</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="148"/>
         <source>Ambient pressure</source>
         <translation>Pressão ambiente</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Heart rate</source>
         <translation>Frequência cardíaca</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="152"/>
         <source>Gradient factor</source>
         <translation>Factor de gradiente</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Mean depth @ s</source>
         <translation>Profundidade média @ s</translation>
     </message>
@@ -6992,81 +4306,54 @@ do GPS actual:</translation>
     <name>DiveShareExportDialog</name>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="178"/>
         <source>Dialog</source>
         <translation>Diálogo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="179"/>
         <source>User ID</source>
         <translation>ID do utilizador</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="75"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="183"/>
         <source>⌫</source>
         <translation>⌫</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="82"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="184"/>
         <source>Get user ID</source>
         <translation>Obter ID do utilizador</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="91"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="91"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="91"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="91"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="185"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:20pt; font-weight:600; color:#ff8000;&quot;&gt;⚠&lt;/span&gt; Not using a UserID means that you will need to manually keep bookmarks to your dives, to find them again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:20pt; font-weight:600; color:#ff8000;&quot;&gt;⚠&lt;/span&gt; Não usar a UserID significa que terá de criar manualmente bookmarks dos seus mergulhos, para poder encontrá-los novamente.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="104"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="187"/>
         <source>Private dives will not appear in &quot;related dives&quot; lists, and will only be accessible if their URL is known.</source>
         <translation>Os mergulhos privados não aparecem nas listas de &quot;mergulhos relacionados&quot; e apenas serão acessíveis se o seu URL for conhecido.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="107"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="189"/>
         <source>Keep dives private</source>
         <translation>Manter mergulhos como privados</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="129"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="190"/>
         <source>Upload dive data</source>
         <translation>Carregar dados dos mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="174"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="191"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -7083,12 +4370,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveSiteSortedModel</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="271"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="278"/>
         <source>Delete dive site?</source>
         <translation>Apagar local de mergulho?</translation>
     </message>
     <message numerus="yes">
-        <location filename="../qt-models/divelocationmodel.cpp" line="272"/>
+        <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>Este local de mergulho tem %1 mergulho. Tem a certeza que deseja apagá-lo?</numerusform><numerusform>Este local de mergulho tem %n mergulhos. Tem a certeza que deseja apagá-lo?
@@ -7096,503 +4383,188 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="399"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="212"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="212"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="212"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="401"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="403"/>
-        <source>Rating</source>
-        <translation>Classificação</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="365"/>
-        <source>Depth</source>
-        <translation>Profundidade</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="407"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="371"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="413"/>
-        <source>Suit</source>
-        <translation>Fato</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="369"/>
-        <source>Temp.</source>
-        <translation>Temp.</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="415"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="415"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="415"/>
-        <source>Cylinder</source>
-        <translation>Garrafa</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="417"/>
-        <source>Gas</source>
-        <translation>Gás</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="379"/>
-        <source>SAC</source>
-        <translation>Consumo</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="423"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="425"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="425"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="425"/>
-        <source>Max CNS</source>
-        <translation>CNS Máx</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="427"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="427"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="427"/>
-        <source>Tags</source>
-        <translation>Categorias</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="387"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="387"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="387"/>
-        <source>Media</source>
-        <translation>Media</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="389"/>
-        <source>Country</source>
-        <translation>País</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="431"/>
-        <source>Buddy</source>
-        <translation>Companheiros</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="433"/>
-        <source>Location</source>
-        <translation>Local</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="405"/>
-        <source>Depth(%1)</source>
-        <translation>Profundidade(%1)</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="69"/>
-        <source>(%1 shown)</source>
-        <translation>(%1 mostrados)</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="405"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="405"/>
-        <source>ft</source>
-        <translation>pés</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="409"/>
-        <source>Temp.(%1%2)</source>
-        <translation>Temp.(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="411"/>
-        <source>Weight(%1)</source>
-        <translation>Peso(%1)</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="411"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="411"/>
-        <source>lbs</source>
-        <translation>libras</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="421"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="421"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="421"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="421"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="421"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="421"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="236"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="236"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="236"/>
-        <source>Max. CNS</source>
-        <translation>CNS Máx.</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="429"/>
-        <source>Media before/during/after dive</source>
-        <translation>Imagens antes/durante/depois do mergulho</translation>
-    </message>
-</context>
-<context>
     <name>DiveTripModelBase</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation>(%1 mostrados)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="273"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="313"/>
-        <source>#</source>
-        <translation>#</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"/>
-        <source>Date</source>
-        <translation>Data</translation>
+        <source>#</source>
+        <translation>#</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"/>
-        <source>Rating</source>
-        <translation>Classificação</translation>
+        <source>Date</source>
+        <translation>Data</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"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>Depth(%1)</source>
         <translation>Profundidade(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>ft</source>
         <translation>pé</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="281"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="283"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="323"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="323"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="325"/>
         <source>Temp.(°%1)</source>
         <translation>Temp.(°%1)</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="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>Weight(%1)</source>
         <translation>Peso(%1)</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="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="325"/>
-        <source>lbs</source>
-        <translation>libra</translation>
-    </message>
-    <message>
         <location filename="../qt-models/divetripmodel.cpp" line="220"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="287"/>
         <location filename="../qt-models/divetripmodel.cpp" line="327"/>
-        <source>Suit</source>
-        <translation>Fato</translation>
+        <source>lbs</source>
+        <translation>libra</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"/>
-        <source>Cylinder</source>
-        <translation>Garrafa</translation>
+        <source>Suit</source>
+        <translation>Fato</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"/>
+        <source>Cylinder</source>
+        <translation>Garrafa</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"/>
         <source>Gas</source>
         <translation>Gás</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="228"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="335"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="228"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="335"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="295"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="297"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="234"/>
         <source>Max. CNS</source>
         <translation>CNS Máx.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="234"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="299"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="341"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="301"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="343"/>
         <source>Tags</source>
         <translation>Categorias</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="343"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="238"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="345"/>
         <source>Media before/during/after dive</source>
         <translation>Imagens antes/durante/depois do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="238"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="303"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="240"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="305"/>
         <source>Country</source>
         <translation>País</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="345"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="242"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="307"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="347"/>
         <source>Buddy</source>
         <translation>Companheiros</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="244"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="309"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="349"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="279"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="281"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="283"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
         <source>Temp.</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="287"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="293"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="295"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="297"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="299"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="341"/>
         <source>Max CNS</source>
         <translation>CNS Máx</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="301"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="303"/>
         <source>Media</source>
         <translation>Media</translation>
     </message>
@@ -7600,193 +4572,107 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="488"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="488"/>
-        <source>no dives were selected</source>
-        <translation>não foram seleccionados nenhuns mergulhos</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="167"/>
-        <source>stylesheet to export to divelogs.de is not found</source>
-        <translation>não foi possível encontrar a folha de estilos para exportar para divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="177"/>
-        <source>failed to create zip file for upload: %s</source>
-        <translation>erro ao criar um ficheiro zip para upload&gt; %s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="238"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="243"/>
         <source>internal error</source>
         <translation>erro interno</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="246"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>A conversão do mergulho %1 para o formato divelogs.de falhou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="274"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="274"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="279"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>erro na escrita do ficheiro zip: %s erro zip %d erro de sistema %d - %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="526"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="717"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="710"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="714"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="714"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="528"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="719"/>
         <source>Done</source>
         <translation>Concluído</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="562"/>
         <source>Uploading dive list...</source>
         <translation>A carregar a lista dos mergulhos...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="589"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="589"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="594"/>
         <source>Downloading dive list...</source>
         <translation>A transferir a lista dos mergulhos...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="626"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="630"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="630"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="635"/>
         <source>Downloading %1 dives...</source>
         <translation>A transferir %1 mergulhos...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="667"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="660"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="664"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="664"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="669"/>
         <source>Download finished - %1</source>
         <translation>Transferência terminada - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="681"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="674"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="678"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="683"/>
         <source>Problem with download</source>
         <translation>Problema ao descarregar</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="675"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="679"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="679"/>
-        <source>The archive could not be opened:
-</source>
-        <translation>Não foi possível abrir o ficheiro:
-</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="688"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="688"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="693"/>
         <source>Corrupted download</source>
         <translation>Transferência corrompida</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="682"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="692"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="689"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="689"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="694"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Não foi possível abrir o ficheiro:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="160"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="491"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="162"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="493"/>
         <source>No dives were selected</source>
         <translation>Não tem mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="170"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="172"/>
         <source>Stylesheet to export to divelogs.de is not found</source>
         <translation>Não foi encontrada a folha de estilos para exportar para divelogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="180"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="182"/>
         <source>Failed to create zip file for upload: %s</source>
         <translation>Falha na criação do ficheiro zip para upload: %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="718"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="711"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="715"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="715"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="720"/>
         <source>Upload finished</source>
         <translation>Carregamento terminado</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="724"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="728"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="728"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/>
         <source>Upload failed</source>
         <translation>A exportação falhou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="727"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="731"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/>
         <source>Upload successful</source>
         <translation>Exportação bem sucedida</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="737"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="730"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="734"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="739"/>
         <source>Login failed</source>
         <translation>O login falhou</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="740"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="737"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="737"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="742"/>
         <source>Cannot parse response</source>
         <translation>Não foi possível analisar a resposta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="751"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="744"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="748"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="748"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="753"/>
         <source>Error: %1</source>
         <translation>Erro: %1</translation>
     </message>
@@ -7852,118 +4738,73 @@ Local existente</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="87"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="86"/>
         <source>Download</source>
         <translation>Transferir</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="91"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="90"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Transferir mergulhos por Bluetooth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="177"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="182"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="202"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="205"/>
         <source>Connecting to dive computer</source>
         <translation>A ligar ao computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="282"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="278"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="277"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="331"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="327"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="326"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Uemis dive computer</source>
         <translation>Procurar computador de mergulho Uemis</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="331"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="327"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="326"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Garmin dive computer</source>
         <translation>Procurar computador de mergulho Garmin</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="351"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="358"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/>
         <source>Cancel download</source>
         <translation>Cancelar a descarga</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="430"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="438"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="433"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="455"/>
         <source>Choose file for dive computer download logfile</source>
         <translation>Seleccionar o ficheiro para descarregar o registo de mergulhos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="431"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="439"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="435"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="434"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
         <source>Log files</source>
         <translation>Ficheiros de registo de mergulhos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="464"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="460"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="459"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="481"/>
         <source>Choose file for dive computer binary dump file</source>
         <translation>Escolher o ficheiro para a descarga do ficheiro binário do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="457"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="465"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="461"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="460"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="482"/>
         <source>Dump files</source>
         <translation>Ficheiros dump (Registos da memória do computador de mergulho)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="493"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="489"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="488"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="510"/>
         <source>Retry download</source>
         <translation>Tentar a descarga novamente</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="444"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="452"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="448"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="447"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="469"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="453"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="449"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="448"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="470"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Gravar a descarga do libdivecomputer não transfere os mergulhos para a lista</translation>
     </message>
@@ -7972,18 +4813,12 @@ Local existente</translation>
     <name>DownloadFromDiveComputer</name>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="317"/>
         <source>Download from dive computer</source>
         <translation>Transferir do computador de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="121"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="329"/>
         <source>Device or mount point</source>
         <translation>Dispositivo ou ponto de montagem</translation>
@@ -7993,18 +4828,6 @@ Local existente</translation>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="100"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="100"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="100"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -8014,282 +4837,176 @@ Local existente</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="52"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="318"/>
         <source>Force download of all dives</source>
         <translation>Forçar a transferência de todos os mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="69"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="320"/>
         <source>Always prefer downloaded dives</source>
         <translation>Preferir sempre os mergulhos já transferidos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="142"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="332"/>
         <source>Download into new trip</source>
         <translation>Transferir para uma nova viagem</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="76"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="321"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Gravar registo do libdivecomputer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="333"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Gravar dados em bruto do libdivecomputer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="90"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="322"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Transferir mergulhos por Bluetooth</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="97"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="324"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Seleccione um dispositivo Bluetooth remoto.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="135"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="331"/>
         <source>Vendor</source>
         <translation>Marca</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="59"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="319"/>
         <source>Dive computer</source>
         <translation>Computador de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="303"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="392"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="365"/>
+        <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="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="334"/>
         <source>Download</source>
         <translation>Transferir</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="265"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="336"/>
         <source>Downloaded dives</source>
         <translation>Mergulhos transferidos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="275"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="337"/>
         <source>Select all</source>
         <translation>Seleccionar tudo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="282"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="282"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="282"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="282"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="338"/>
         <source>Unselect all</source>
         <translation>Não seleccionar tudo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="323"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="339"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="291"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="296"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="340"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
         <source>Dive Computer</source>
         <translation>Modelo</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="22"/>
         <source>Bluetooth is not enabled</source>
         <translation>Bluetooth está desactivado</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/>
         <source> Vendor name: </source>
         <translation>Nome do fabricante:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="97"/>
         <source>USB device</source>
         <translation>Dispositivo USB</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="105"/>
         <source> Dive Computer:</source>
         <translation>Computador de mergulho:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="145"/>
         <source> Connection:</source>
         <translation>Ligação:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/>
         <source> Previously used dive computers: </source>
         <translation>Computadores de mergulho usados anteriormente:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="279"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/>
         <source>Retry</source>
         <translation>Tentar novamente</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="291"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="296"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <source>Quit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="310"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="316"/>
         <source>Rescan</source>
         <translation>Voltar a procurar</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="321"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="314"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="319"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="319"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="325"/>
         <source> Downloaded dives</source>
         <translation>Mergulhos descarregados</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="322"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="320"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="326"/>
         <source>Info:</source>
         <translation>Informação:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="345"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="349"/>
         <source>force downloading all dives</source>
         <translation>forçar a transferência de todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="351"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="356"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="356"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="387"/>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="376"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="376"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="407"/>
         <source>Select All</source>
         <translation>Seleccionar todos</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="385"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="416"/>
         <source>Unselect All</source>
         <translation>Desmarcar todos</translation>
     </message>
@@ -8297,10 +5014,7 @@ Local existente</translation>
 <context>
     <name>DownloadThread</name>
     <message>
-        <location filename="../core/downloadfromdcthread.cpp" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/downloadfromdcthread.cpp" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/downloadfromdcthread.cpp" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/downloadfromdcthread.cpp" line="99"/>
+        <location filename="../core/downloadfromdcthread.cpp" line="102"/>
         <source>No new dives downloaded from dive computer</source>
         <translation>Não foram descarregados novos mergulhos do computador de mergulho</translation>
     </message>
@@ -8308,7 +5022,7 @@ Local existente</translation>
 <context>
     <name>EditBuddies</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="607"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="638"/>
         <source>buddies</source>
         <translation>companheiiros</translation>
     </message>
@@ -8316,7 +5030,7 @@ Local existente</translation>
 <context>
     <name>EditDiveMaster</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="630"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="661"/>
         <source>dive master</source>
         <translation>guia de mergulho</translation>
     </message>
@@ -8324,15 +5038,23 @@ Local existente</translation>
 <context>
     <name>EditMode</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="442"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="454"/>
         <source>dive mode</source>
         <translation>modo de mergulho</translation>
     </message>
 </context>
 <context>
+    <name>EditNumber</name>
+    <message>
+        <location filename="../desktop-widgets/command_edit.cpp" line="475"/>
+        <source>number</source>
+        <translation>número</translation>
+    </message>
+</context>
+<context>
     <name>EditTags</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="575"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="606"/>
         <source>tags</source>
         <translation>categorias</translation>
     </message>
@@ -8340,7 +5062,7 @@ Local existente</translation>
 <context>
     <name>EditTagsBase</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="513"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="547"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation><numerusform>Editar %1 mergulho</numerusform><numerusform>Editar %n mergulhos</numerusform></translation>
@@ -8350,146 +5072,38 @@ Local existente</translation>
     <name>ExtraDataModel</name>
     <message>
         <location filename="../qt-models/divecomputerextradatamodel.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divecomputerextradatamodel.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divecomputerextradatamodel.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divecomputerextradatamodel.cpp" line="11"/>
         <source>Key</source>
         <translation>Chave</translation>
     </message>
     <message>
         <location filename="../qt-models/divecomputerextradatamodel.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divecomputerextradatamodel.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divecomputerextradatamodel.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divecomputerextradatamodel.cpp" line="11"/>
         <source>Value</source>
         <translation>Valor</translation>
     </message>
 </context>
 <context>
-    <name>FacebookConnectWidget</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="14"/>
-        <source>Preferences</source>
-        <translation>Preferências</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="82"/>
-        <source>Connect to Facebook text placeholder</source>
-        <translation>Ligar ao campo de texto do Facebook</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/>
-        <source>To disconnect Subsurface from your Facebook account, use the &apos;Share on&apos; menu entry.</source>
-        <translation>Para desligar o Subsurface da sua conta do Facebook, use o menu &apos;Ligar partilha&apos;.</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/>
-        <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
-        <translation>Para ligar ao Facebook, por favor inicie a sessão (login). Isto permite ao Subsurface publicar os mergulhos na sua Cronologia (timeline)</translation>
-    </message>
-</context>
-<context>
-    <name>FacebookManager</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/>
-        <source>Facebook logged in successfully</source>
-        <translation>Registo no Facebook com sucesso</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/>
-        <source>Error, unknown user id, cannot login.</source>
-        <translation>Erro, ID de utilizador desconhecida, não é possível entrar</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
-        <source>Dive uploaded successfully to Facebook</source>
-        <translation>Mergulho carregado para o Facebook</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/>
-        <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source>
-        <translation>O carregamento do mergulho falhou. Por favor reveja a mensagem e envie-a para a mailing list do Subsurface</translation>
-    </message>
-</context>
-<context>
-    <name>FacebookPlugin</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebook_integration.cpp" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebook_integration.cpp" line="35"/>
-        <source>Facebook</source>
-        <translation>Facebook</translation>
-    </message>
-</context>
-<context>
-    <name>FilterBase</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="562"/>
-        <source>Select All</source>
-        <translation>Seleccionar todos</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="563"/>
-        <source>Unselect All</source>
-        <translation>Desmarcar todos</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="564"/>
-        <source>Invert Selection</source>
-        <translation>Inverter selecção</translation>
-    </message>
-</context>
-<context>
     <name>FilterWidget</name>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/listfilter.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/listfilter.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/listfilter.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="82"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/listfilter.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/listfilter.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/listfilter.ui" line="40"/>
         <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="83"/>
         <source>Text label</source>
         <translation>Etiqueta de texto</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/listfilter.ui" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/listfilter.ui" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/listfilter.ui" line="50"/>
         <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="84"/>
         <source>Filter this list</source>
         <translation>Filtrar esta lista</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/listfilter.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/listfilter.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/listfilter.ui" line="57"/>
         <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="86"/>
         <source>Negate filter</source>
         <translation>Negar filtro</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/listfilter.ui" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/listfilter.ui" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/listfilter.ui" line="60"/>
         <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="88"/>
         <source>¬</source>
         <translation>¬</translation>
@@ -8503,148 +5117,143 @@ Local existente</translation>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="20"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="41"/>
         <source>Reset / close</source>
         <translation>Reinicializar / fechar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="30"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="75"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="51"/>
         <location filename="../desktop-widgets/filterwidget2.ui" line="96"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="113"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="117"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="134"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="37"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="58"/>
         <source>People</source>
         <translation>Pessoas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="44"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="68"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="120"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="162"/>
+        <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"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="51"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="72"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="58"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="79"/>
         <source>Tags</source>
         <translation>Categorias</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="82"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="103"/>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="89"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="110"/>
         <source>To</source>
         <translation>Para</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="106"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="127"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="136"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="157"/>
         <source>Equipment</source>
         <translation>Equipamento</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="152"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="173"/>
         <source>Water Temp</source>
         <translation>Temp. de Água</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="169"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="190"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="176"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="197"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="183"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="204"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="190"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="211"/>
         <source>Air Temp</source>
         <translation>Temperatura do ar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="249"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="270"/>
         <source>Logged</source>
         <translation>Registados</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="259"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="280"/>
         <source>Planned</source>
         <translation>Planeados</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/filterwidget.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/filterwidget.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/filterwidget.ui" line="73"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="310"/>
+        <source>Close filters</source>
+        <translation>Fechar filtros</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>Reinicializar filtros</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="318"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="337"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="356"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="375"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="394"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="413"/>
+        <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>Todos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="323"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="342"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="361"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="380"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="399"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="418"/>
+        <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>Qualquer um</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="328"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="347"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="366"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="385"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="404"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="423"/>
+        <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>Nenhum</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/filterwidget.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/filterwidget.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/filterwidget.ui" line="87"/>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="121"/>
         <source>Show/hide filters</source>
         <translation>Mostrar/ocultar filtros</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="289"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/filterwidget.ui" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/filterwidget.ui" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/filterwidget.ui" line="101"/>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="124"/>
         <source>Close and reset filters</source>
         <translation>Fechar e reinicializar filtros</translation>
@@ -8664,98 +5273,62 @@ Local existente</translation>
     <name>FindMovedImagesDialog</name>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.ui" line="23"/>
         <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="154"/>
         <source>Find moved media files</source>
         <translation>Procurar ficheiros multimedia</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.ui" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.ui" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.ui" line="37"/>
         <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="155"/>
         <source>Found media files</source>
         <translation>Ficheiros encontrados</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.ui" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.ui" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.ui" line="71"/>
         <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="157"/>
         <source>Match only media files in selected dive(s)</source>
         <translation>Fazer a correspondência de ficheiros multimedia apenas para o(s) mergulho(s) seleccionado(s)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.ui" line="95"/>
         <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="159"/>
         <source>Scanning:</source>
         <translation>A procurar:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.ui" line="121"/>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/>
         <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="240"/>
         <source>Select folder and scan</source>
         <translation>Seleccionar pasta e procurar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="173"/>
         <source>Traverse media directories</source>
         <translation>Atravessar as pastas de ficheiros multimedia</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="179"/>
         <source>Stop scanning</source>
         <translation>Parar a procura</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="250"/>
         <source>Scanning cancelled - results may be incomplete</source>
         <translation>Procura cancelada - os resultados podem estar incompletos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="254"/>
         <source>No matching media files found</source>
         <translation>Não foram encontrados ficheiros multimedia</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="266"/>
         <source>Found &lt;b&gt;%1&lt;/b&gt; media files at their current place.</source>
         <translation>Encontrados&lt;b&gt;%1&lt;/b&gt;ficheiros multimedia na localização actual.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="268"/>
         <source>Found &lt;b&gt;%1&lt;/b&gt; media files at new locations:</source>
         <translation>Encontrados  &lt;b&gt;%1&lt;/b&gt;ficheiros em novas localizações:</translation>
     </message>
@@ -8763,18 +5336,12 @@ Local existente</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2225"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2225"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2225"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2225"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2227"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2230"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2230"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2230"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2230"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2232"/>
         <source>Firmware update failed!</source>
         <translation>A actualização do firmware falhou!</translation>
     </message>
@@ -8790,10 +5357,7 @@ Local existente</translation>
 <context>
     <name>GasSelectionModel</name>
     <message>
-        <location filename="../qt-models/models.cpp" line="38"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/models.cpp" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/models.cpp" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/models.cpp" line="52"/>
+        <location filename="../qt-models/models.cpp" line="39"/>
         <source>cyl.</source>
         <translation>garr.</translation>
     </message>
@@ -8810,41 +5374,26 @@ Local existente</translation>
     <name>GpsList</name>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/GpsList.qml" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/GpsList.qml" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/GpsList.qml" line="14"/>
         <source>GPS Fixes</source>
         <translation>Pontos de GPS</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/GpsList.qml" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/GpsList.qml" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/GpsList.qml" line="30"/>
         <source>Date: </source>
         <translation>Data:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/GpsList.qml" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/GpsList.qml" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Nome:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/GpsList.qml" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/GpsList.qml" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/GpsList.qml" line="54"/>
         <source>Latitude: </source>
         <translation>Latitude:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/GpsList.qml" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/GpsList.qml" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/GpsList.qml" line="65"/>
         <source>Longitude: </source>
         <translation>Longitude:</translation>
     </message>
@@ -8852,10 +5401,7 @@ Local existente</translation>
 <context>
     <name>GpsLocation</name>
     <message>
-        <location filename="../core/gpslocation.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/gpslocation.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/gpslocation.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/gpslocation.cpp" line="131"/>
+        <location filename="../core/gpslocation.cpp" line="134"/>
         <source>Unknown GPS location (no GPS source)</source>
         <translation>Localização GPS desconhecida (não há GPS)</translation>
     </message>
@@ -8864,17 +5410,11 @@ Local existente</translation>
     <name>KMessageWidget</name>
     <message>
         <location filename="../desktop-widgets/kmessagewidget.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/kmessagewidget.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/kmessagewidget.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/kmessagewidget.cpp" line="92"/>
         <source>&amp;Close</source>
         <translation>&amp;Fechar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/kmessagewidget.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/kmessagewidget.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/kmessagewidget.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/kmessagewidget.cpp" line="93"/>
         <source>Close message</source>
         <translation>Fechar mensagem</translation>
     </message>
@@ -8908,137 +5448,78 @@ Local existente</translation>
     </message>
 </context>
 <context>
-    <name>LocationFilter</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="548"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="548"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="593"/>
-        <source>Location</source>
-        <translation>Local</translation>
-    </message>
-</context>
-<context>
     <name>LocationFilterDelegate</name>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/modeldelegates.cpp" line="491"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/modeldelegates.cpp" line="491"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/modeldelegates.cpp" line="491"/>
         <source> (same GPS fix)</source>
         <translation>(posição GPS igual)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/modeldelegates.cpp" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/modeldelegates.cpp" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/modeldelegates.cpp" line="496"/>
         <source> (~%1 away</source>
         <translation>(~%1 ausente</translation>
     </message>
     <message numerus="yes">
         <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/modeldelegates.cpp" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/modeldelegates.cpp" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/modeldelegates.cpp" line="497"/>
         <source>, %n dive(s) here)</source>
         <translation><numerusform>, %n mergulho aqui)</numerusform><numerusform>, %n mergulho(s) aqui)</numerusform></translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="509"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/modeldelegates.cpp" line="502"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/modeldelegates.cpp" line="502"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/modeldelegates.cpp" line="502"/>
         <source>(no existing GPS data, add GPS fix from this dive)</source>
         <translation>(sem posição GPS. Adicionar posição GPS a partir deste mergulho)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="511"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/modeldelegates.cpp" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/modeldelegates.cpp" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/modeldelegates.cpp" line="504"/>
         <source>(no GPS data)</source>
         <translation>(sem dados GPS)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="513"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/modeldelegates.cpp" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/modeldelegates.cpp" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/modeldelegates.cpp" line="506"/>
         <source>Pick site: </source>
         <translation>Escolher local:</translation>
     </message>
 </context>
 <context>
-    <name>LocationFilterModel</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/filtermodels.cpp" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/filtermodels.cpp" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/filtermodels.cpp" line="547"/>
-        <source>No location set</source>
-        <translation>Não foi definido um local</translation>
-    </message>
-</context>
-<context>
     <name>LocationInformation</name>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="189"/>
         <source>GroupBox</source>
         <translation>GroupBox</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="29"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="191"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="36"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="192"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="43"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="193"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="53"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="194"/>
         <source>Coordinates</source>
         <translation>Coordenadas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="73"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="196"/>
         <source>Reverse geo lookup</source>
         <translation>Busca geográfica inversa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="76"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="198"/>
         <source>...</source>
         <translation>...</translation>
@@ -9054,35 +5535,23 @@ Local existente</translation>
         <translation>Mostrar locais de mergulho num raio de:</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="97"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="199"/>
         <source>Dive sites on same coordinates</source>
         <translation>Locais de mergulho com as mesmas coordenadas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="138"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="200"/>
         <source>Tags</source>
         <translation>Categorias</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="152"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="202"/>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="162"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="204"/>
         <source>Update location on map</source>
         <translation>Actualizar localização no mapa</translation>
@@ -9119,74 +5588,25 @@ Local existente</translation>
 <context>
     <name>LocationInformationWidget</name>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="26"/>
-        <source>Apply changes</source>
-        <translation>Aplicar alterações</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="29"/>
-        <source>Discard changes</source>
-        <translation>Descartar alterações</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/locationinformation.cpp" line="29"/>
         <source>Done</source>
         <translation>Concluído</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.cpp" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="259"/>
         <source>Dive site management</source>
         <translation>Gestão de locais de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="56"/>
         <source>Merge into current site</source>
         <translation>Juntar com o local de mergulho actual</translation>
     </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="75"/>
-        <source>Merging dive sites</source>
-        <translation>A juntar os locais de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="76"/>
-        <source>You are about to merge dive sites, you can't undo that action 
- Are you sure you want to continue?</source>
-        <translation>Está prestes a juntar locais de mergulho. Esta ação não pode ser revertida.
-Tem a certeza que quer continuar?</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="271"/>
-        <source>You are editing a dive site</source>
-        <translation>Está a editar um local de mergulho</translation>
-    </message>
 </context>
 <context>
     <name>Log</name>
     <message>
         <location filename="../mobile-widgets/qml/Log.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Log.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Log.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Log.qml" line="15"/>
         <source>Application Log</source>
         <translation>Registo da aplicação</translation>
     </message>
@@ -9195,97 +5615,55 @@ Tem a certeza que quer continuar?</translation>
     <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="30"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="454"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="444"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="444"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="444"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="544"/>
+        <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="../subsurface/desktop-widgets/ui_maintab.h" line="511"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="512"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="536"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="536"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="536"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="491"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="87"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="493"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="100"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="97"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="494"/>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="107"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="226"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="224"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="288"/>
         <source>Air temp.</source>
         <translation>Temp. do ar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="117"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="227"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="225"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="289"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="289"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="289"/>
         <source>Water temp.</source>
         <translation>Temp. da água</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="192"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="543"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="535"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="222"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="501"/>
         <source>Edit dive site</source>
         <translation>Editar local de mergulho</translation>
@@ -9293,80 +5671,52 @@ Tem a certeza que quer continuar?</translation>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="225"/>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="235"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="225"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="225"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="225"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="257"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="504"/>
         <source>Divemaster</source>
         <translation>Guia de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="277"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="267"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="505"/>
         <source>Buddy</source>
         <translation>Companheiros</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="313"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="313"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="313"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="506"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="326"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="326"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="326"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="507"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="333"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="402"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="392"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="392"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="392"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="398"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="509"/>
         <source>Tags</source>
         <translation>Categorias</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="402"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="402"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="402"/>
+        <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>Modo de mergulho</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="496"/>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="513"/>
         <source>Equipment</source>
@@ -9374,51 +5724,33 @@ Tem a certeza que quer continuar?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="164"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="164"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="164"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="497"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="80"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="492"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
         <source>Extra Info</source>
         <translation>Informação extra</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="57"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="59"/>
         <source>Statistics</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
         <source>Media</source>
         <translation>Media</translation>
     </message>
@@ -9428,136 +5760,68 @@ Tem a certeza que quer continuar?</translation>
         <translation>Locais de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="85"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="90"/>
         <source>Apply changes</source>
         <translation>Aplicar alterações</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="89"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="94"/>
         <source>Discard changes</source>
         <translation>Descartar alterações</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/>
         <source>Undo</source>
         <translation>Reverter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="731"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="735"/>
         <source>Warning: edited %1 dives</source>
         <translation>Aviso: editados %1 mergulhos</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="105"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="105"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="105"/>
-        <source>Cylinders</source>
-        <translation>Garrafas</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="106"/>
-        <source>Add cylinder</source>
-        <translation>Adicionar garrafa</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="109"/>
-        <source>Weights</source>
-        <translation>Lastro</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="110"/>
-        <source>Add weight system</source>
-        <translation>Adicionar sistema de lastro</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="223"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="285"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="285"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="285"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="221"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. do ar [%1]</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="286"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="286"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="286"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="222"/>
         <source>Water temp. [%1]</source>
         <translation>Temp. da água [%1]</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="329"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="329"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="329"/>
-        <source>This trip is being edited.</source>
-        <translation>Esta viagem está a ser editada.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="336"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="260"/>
         <source>Multiple dives are being edited.</source>
         <translation>Estão a ser editados vários mergulhos.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="338"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="262"/>
         <source>This dive is being edited.</source>
         <translation>Este mergulho está a ser editado.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="452"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="492"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="483"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="458"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/>
         <source>Trip notes</source>
         <translation>Notas sobre a viagem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="487"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="478"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="478"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="478"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="491"/>
         <source>Trip location</source>
         <translation>Local da viagem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="686"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="982"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="982"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="980"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="690"/>
         <source>Discard the changes?</source>
         <translation>Eliminar as alterações?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="687"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="983"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="983"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="981"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="691"/>
         <source>You are about to discard your changes.</source>
         <translation>Está prestes a eliminar as alterações.</translation>
     </message>
@@ -9566,362 +5830,240 @@ Tem a certeza que quer continuar?</translation>
     <name>MainWindow</name>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="614"/>
         <source>&amp;File</source>
         <translation>&amp;Ficheiro</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="82"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="615"/>
         <source>&amp;Log</source>
         <translation>&amp;Log</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="98"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="616"/>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="114"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="617"/>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="123"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="618"/>
         <source>&amp;Import</source>
         <translation>&amp;Importar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="131"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="619"/>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="136"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="620"/>
         <source>Share on</source>
         <translation>Ligar partilha</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="143"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="529"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Novo logbook</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="146"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="531"/>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="154"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="533"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Abrir logbook</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="157"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="570"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="570"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="506"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="165"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="537"/>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="539"/>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="176"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="541"/>
         <source>Sa&amp;ve as</source>
         <translation>G&amp;ravar como</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="543"/>
         <source>Save as</source>
         <translation>Guardar como</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="187"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="545"/>
         <source>&amp;Close</source>
         <translation>&amp;Fechar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="547"/>
         <source>Close</source>
         <translation>Encerrar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="198"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="549"/>
         <source>&amp;Print</source>
         <translation>&amp;Imprimir</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="206"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="550"/>
         <source>P&amp;references</source>
         <translation>P&amp;referências</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="217"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="551"/>
         <source>&amp;Quit</source>
         <translation>&amp;Fechar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="228"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="552"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importar do &amp;computador de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="236"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="553"/>
         <source>Edit device &amp;names</source>
         <translation>Editar &amp;nomes dos dispositivos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="241"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="554"/>
         <source>&amp;Add dive</source>
         <translation>&amp;Adicionar mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="249"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="555"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Copiar detalhes do mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="257"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="556"/>
         <source>&amp;Paste dive components</source>
         <translation>Colar detalhes do mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="265"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="557"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Renumerar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="558"/>
         <source>Auto &amp;group</source>
         <translation>Agrupar &amp;automaticamente</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="281"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="559"/>
         <source>&amp;Yearly statistics</source>
         <translation>&amp;Estatísticas anuais</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="289"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="560"/>
         <source>&amp;Dive list</source>
         <translation>&amp;Lista de mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="297"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="561"/>
         <source>&amp;Profile</source>
         <translation>&amp;Perfil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="305"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="562"/>
         <source>&amp;Info</source>
         <translation>&amp;Informações</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="313"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="563"/>
         <source>&amp;All</source>
         <translation>&amp;Todos os painéis</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="321"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="564"/>
         <source>P&amp;revious DC</source>
         <translation>Computador de mergulho &amp;anterior</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="329"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="565"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Próximo computador de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="337"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="566"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;Acerca do Subsurface</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="345"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="567"/>
         <source>User &amp;manual</source>
         <translation>&amp;Manual do utilizador</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="353"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="568"/>
         <source>&amp;Map</source>
         <translation>&amp;Mapa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="368"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="368"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="368"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="361"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="569"/>
         <source>P&amp;lan dive</source>
         <translation>P&amp;lanear mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="369"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="570"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Importar ficheiros de registo de mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="372"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="572"/>
         <source>Import divelog files from other applications</source>
         <translation>Importar logbooks de outros programas</translation>
@@ -9938,54 +6080,36 @@ Tem a certeza que quer continuar?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="398"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="387"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="387"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="574"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importar &amp;de Divelogs.de</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="388"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="575"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Ecrã completo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="398"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="398"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="391"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="577"/>
         <source>Toggle full screen</source>
         <translation>Ligar/desligar ecrã completo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="399"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="579"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Procurar actualizações</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="404"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="580"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="425"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="582"/>
         <source>Export dive logs</source>
         <translation>Exportar logbook</translation>
@@ -10002,171 +6126,114 @@ Tem a certeza que quer continuar?</translation>
         <translation>Visualizar/ocultar informação de descompressão</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="584"/>
         <source>Configure &amp;dive computer</source>
         <translation>Configurar &amp;computador de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="444"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="426"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="585"/>
         <source>Edit &amp;dive in planner</source>
         <translation>E&amp;ditar mergulho no planeador</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="456"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="438"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="586"/>
         <source>Toggle pO₂ graph</source>
         <translation>Mostrar/ocultar gráfico da pO₂ </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="468"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="457"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="457"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="450"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="587"/>
         <source>Toggle pN₂ graph</source>
         <translation>Mostrar/ocultar gráfico da pN₂ </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="480"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="469"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="469"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="462"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="588"/>
         <source>Toggle pHe graph</source>
         <translation>Mostrar/ocultar gráfico de pHe</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="492"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="481"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="481"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="474"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="589"/>
         <source>Toggle DC reported ceiling</source>
         <translation>Mostrar/ocultar o tecto indicado pelo computador de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="493"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="493"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="486"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="590"/>
         <source>Toggle calculated ceiling</source>
         <translation>Mostrar/ocultar o tecto calculado</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="505"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="505"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="498"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="591"/>
         <source>Toggle calculating all tissues</source>
         <translation>Mostrar/ocultar cálculo para todos os tecidos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="528"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="510"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="592"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation>Mostrar/ocultar tecto calculado com intervalos de 3 m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="540"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="529"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="529"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="522"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="593"/>
         <source>Toggle heart rate</source>
         <translation>Mostrar/ocultar ritmo cardíaco</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="534"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="594"/>
         <source>Toggle MOD</source>
         <translation>Mostrar/ocultar MOD</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="546"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="595"/>
         <source>Toggle EAD, END, EADD</source>
         <translation>Mostrar/ocultar EAD, END, EADD</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="576"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="565"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="565"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="558"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="596"/>
         <source>Toggle NDL, TTS</source>
         <translation>Mostrar/ocultar NDL, TTS</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="588"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="577"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="577"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="570"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="597"/>
         <source>Toggle SAC rate</source>
         <translation>Mostrar/ocultar taxa de consumo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="600"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="589"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="589"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="582"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="598"/>
         <source>Toggle ruler</source>
         <translation>Mostrar/ocultar régua</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="612"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="601"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="601"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="594"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="599"/>
         <source>Scale graph</source>
         <translation>Escalar gráfico</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="624"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="613"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="613"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="606"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="600"/>
         <source>Toggle media</source>
         <translation>Mostrar/ocultar ficheiros multimedia</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="674"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="674"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="667"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="607"/>
         <source>&amp;Find moved media files</source>
         <translation>&amp;Procurar ficheiros movidos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="625"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="625"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="618"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="601"/>
         <source>Toggle gas bar</source>
         <translation>Mostrar/ocultar barra de gases</translation>
@@ -10178,199 +6245,108 @@ Tem a certeza que quer continuar?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="644"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="633"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="633"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="626"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="602"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filtrar lista mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="659"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="648"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="648"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="603"/>
         <source>Toggle tissue heat-map</source>
         <translation>Mostrar/ocultar mapa de tecidos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="664"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="653"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="653"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="646"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="604"/>
         <source>User &amp;survey</source>
         <translation>&amp;Questionário ao utilizador</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="669"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="658"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="658"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="651"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="605"/>
         <source>&amp;Undo</source>
         <translation>&amp;Reverter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="666"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="666"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="659"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="606"/>
         <source>&amp;Redo</source>
         <translation>&amp;Refazer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="690"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="679"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="679"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="672"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="608"/>
         <source>Open c&amp;loud storage</source>
         <translation>Abrir armazenamento &amp;remoto</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="677"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="609"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Gravar rem&amp;otamente</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="700"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="682"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="610"/>
         <source>&amp;Manage dive sites</source>
         <translation>&amp;Gerir locais de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="705"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="694"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="694"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="687"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="611"/>
         <source>Dive Site &amp;Edit</source>
         <translation>&amp;Editar locais de mergulho</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="699"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="612"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="695"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="613"/>
         <source>Cloud storage online</source>
         <translation>Armazenamento remoto em linha</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="421"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="421"/>
-        <source>Connect to</source>
-        <translation>Ligar a</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="415"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="415"/>
-        <source>Disconnect from</source>
-        <translation>Desligar de</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="483"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="530"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1516"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="561"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="606"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1571"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="561"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="606"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1571"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1507"/>
+        <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>Por favor grave ou cancele as edições feitas a este mergulho antes de abrir um novo ficheiro.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="489"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="567"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="567"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="503"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
         <source>Open file</source>
         <translation>Abrir Ficheiro</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1913"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="571"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="571"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="507"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1886"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="685"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="604"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="653"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="803"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="911"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1787"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="655"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="672"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="719"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="864"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="973"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1811"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="655"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="672"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="719"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="864"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="973"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1811"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="655"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="608"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="655"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="800"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="909"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1747"/>
+        <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"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="686"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="693"/>
         <source>Trying to merge dives with %1min interval in between</source>
         <translation>A tentar juntar mergulhos com %1min de intervalo entre eles</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="278"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="278"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="271"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
         <source>Template backup created</source>
         <translation>Criada cópia de segurança do modelo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="279"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="279"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="258"/>
         <source>The following backup printing templates were created:
 
 %1
@@ -10391,399 +6367,231 @@ Localização:
 Por favor tenha em atenção que a partir desta versão do Subsurface os modelos padrão são ficheiros apenas de leitura e não devem ser editados directamente, uma vez que a aplicação poderá criá-los novamente no arranque.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="604"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="672"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="672"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="608"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="607"/>
         <source>Please save or cancel the current dive edit before going online</source>
         <translation>Por favor grave ou cancele as edições ao mergulho antes de usar o armazenamento remoto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="617"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="621"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="620"/>
         <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>Existem mudanças que não foram gravadas. Quer guardá-las no armazenamento remoto?
 Se responder não, o armazenamento remoto será sincronizado apenas da próxima vez que seleccionar &quot;Abrir armazenamento remoto&quot; ou &quot;Guardar no armazenamento remoto&quot;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="627"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="631"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="630"/>
         <source>Failure taking cloud storage online</source>
         <translation>Falha ao colocar o armazenamento remoto em linha</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="700"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="760"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="760"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="696"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="703"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de fechar o ficheiro.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="803"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="864"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="864"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="800"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="806"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de adicionar outro mergulho.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="855"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="916"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="916"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="852"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="858"/>
         <source>Print runtime table</source>
         <translation>Imprimir tabela de runtime</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="911"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="973"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="973"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="909"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="914"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Está a tentar planear novamente um mergulho que não foi criado no planeador de mergulhos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1671"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1774"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>multiple files</source>
         <translation>múltiplos ficheiros</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1752"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1766"/>
         <source>Open dive site file</source>
         <translation>Abrir ficheiro dos locais de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1787"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1811"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1811"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1747"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Por favor, termine a edição em curso antes de iniciar outra.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1018"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1085"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1085"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1021"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1017"/>
         <source>Yearly statistics</source>
         <translation>Estatísticas anuais</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1245"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1286"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1312"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1353"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1312"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1353"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1248"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1289"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/>
         <source>Dive log files</source>
         <translation>Ficheiros de registo de mergulhos</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="1545"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1332"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1374"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1600"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1332"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1374"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1600"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1268"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1310"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1536"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1559"/>
         <source>Subsurface files</source>
         <translation>Ficheiros do Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1333"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1375"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1333"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1375"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1269"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1311"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
         <source>Cochran</source>
         <translation>Cochran</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1334"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1377"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1334"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1377"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1270"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1313"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
         <source>DiveLogs.de</source>
         <translation>DiveLogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1335"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1378"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1335"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1378"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1271"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1314"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
         <source>JDiveLog</source>
         <translation>JDiveLog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1336"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1379"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1336"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1379"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1272"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1315"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
         <source>Liquivision</source>
         <translation>Liquivision</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1337"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1380"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1337"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1380"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1273"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1316"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
         <source>Suunto</source>
         <translation>Suunto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1338"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1381"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1338"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1381"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1274"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1317"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
         <source>UDCF</source>
         <translation>UDCF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1339"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1382"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1339"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1382"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1275"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1318"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
         <source>UDDF</source>
         <translation>UDDF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1340"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1383"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1340"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1383"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1276"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1319"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
         <source>XML</source>
         <translation>XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1341"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1384"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1341"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1384"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1277"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1320"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
         <source>Divesoft</source>
         <translation>Divesoft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1342"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1385"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1342"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1385"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1278"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1321"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
         <source>Datatrak/WLog</source>
         <translation>Datatrak/WLog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1276"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1343"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1386"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1343"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1386"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1279"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1322"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
         <source>MkVI files</source>
         <translation>MkVI files</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1344"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1387"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1344"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1387"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1280"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1323"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1276"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
         <source>APD log viewer</source>
         <translation>APD log viewer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1345"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1388"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1345"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1388"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1281"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1324"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
         <source>OSTCtools</source>
         <translation>OSTCtools</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1279"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1346"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1389"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1346"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1389"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1282"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1325"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
         <source>DAN DL7</source>
         <translation>DAN DL7</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1376"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1376"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1312"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
         <source>CSV</source>
         <translation>CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1390"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1390"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1326"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/>
         <source>All files</source>
         <translation>Todos os ficheiros</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1330"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/>
         <source>Dive site files</source>
         <translation>Ficheiros de locais de mergulho</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1400"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1400"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1336"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Deseja gravar as alterações feitas no ficheiro %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1346"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1401"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1401"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1337"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Deseja gravar as alterações feitas no ficheiro de dados?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="616"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1406"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1406"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="620"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1342"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
         <source>Save changes?</source>
         <translation>Guardar alterações?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1407"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1407"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1343"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>As alterações serão perdidas se não forem gravadas.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1544"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1599"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1599"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1535"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1558"/>
         <source>Save file as</source>
         <translation>Guardar ficheiro como</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1632"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1687"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1687"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1623"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1646"/>
         <source>[local cache for] %1</source>
         <translation>[cache local para] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1688"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1688"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1624"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1647"/>
         <source>[cloud storage for] %1</source>
         <translation>[armazenamento remoto para] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1700"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1755"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1755"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1691"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/>
         <source>Opening datafile from older version</source>
         <translation>A abrir ficheiro de uma versão mais antiga</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1701"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1756"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1756"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1692"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/>
         <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>Abriu  um ficheiro de uma versão antiga do Subsurface. Recomendamos que leia o manual para saber mais sobre as alterações para esta nova versão, especialmente no que respeita a gestão de locais de mergulho, que sofreu alterações importantes.
 O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sistema de gestão dos locais de mergulho para garantir que tudo está correcto.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1725"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1780"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1780"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1716"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1739"/>
         <source>Open dive log file</source>
         <translation>Abrir ficheiro de registo de mergulhos</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1913"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1886"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Contacting cloud service...</source>
         <translation>A contactar o serviço remoto...</translation>
     </message>
@@ -10792,9 +6600,6 @@ O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sis
     <name>MapPage</name>
     <message>
         <location filename="../mobile-widgets/qml/MapPage.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/MapPage.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/MapPage.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/MapPage.qml" line="10"/>
         <source>Map</source>
         <translation>Mapa</translation>
     </message>
@@ -10803,9 +6608,6 @@ O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sis
     <name>MapWidget</name>
     <message>
         <location filename="../map-widget/qml/MapWidget.qml" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/map-widget/qml/MapWidget.qml" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/map-widget/qml/MapWidget.qml" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/map-widget/qml/MapWidget.qml" line="255"/>
         <source>Drag the selected dive location</source>
         <translation>Arraste o local de mergulho seleccionado</translation>
     </message>
@@ -10814,33 +6616,21 @@ O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sis
     <name>MapWidgetContextMenu</name>
     <message>
         <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/map-widget/qml/MapWidgetContextMenu.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.5/map-widget/qml/MapWidgetContextMenu.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.6/map-widget/qml/MapWidgetContextMenu.qml" line="15"/>
         <source>Open in Google Maps</source>
         <translation>Abrir no Google Maps</translation>
     </message>
     <message>
         <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.4/map-widget/qml/MapWidgetContextMenu.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/map-widget/qml/MapWidgetContextMenu.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/map-widget/qml/MapWidgetContextMenu.qml" line="16"/>
         <source>Copy coordinates to clipboard (decimal)</source>
         <translation>Copiar coordenadas para a área de transferência (decimal)</translation>
     </message>
     <message>
         <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/map-widget/qml/MapWidgetContextMenu.qml" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/map-widget/qml/MapWidgetContextMenu.qml" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/map-widget/qml/MapWidgetContextMenu.qml" line="17"/>
         <source>Copy coordinates to clipboard (sexagesimal)</source>
         <translation>Copiar coordenadas para a área de transferência (sexagesimal)</translation>
     </message>
     <message>
         <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/map-widget/qml/MapWidgetContextMenu.qml" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.5/map-widget/qml/MapWidgetContextMenu.qml" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.6/map-widget/qml/MapWidgetContextMenu.qml" line="18"/>
         <source>Select visible dive locations</source>
         <translation>Seleccionar os locais de mergulho visíveis</translation>
     </message>
@@ -10849,9 +6639,6 @@ O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sis
     <name>MapWidgetError</name>
     <message>
         <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.4/map-widget/qml/MapWidgetError.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.5/map-widget/qml/MapWidgetError.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.6/map-widget/qml/MapWidgetError.qml" line="10"/>
         <source>MapWidget.qml failed to load!
 The QML modules QtPositioning and QtLocation could be missing!</source>
         <translation>Falha ao carregar o MapWidget.qml!
@@ -10859,40 +6646,14 @@ Os módulos QML QtPositioning e QtLocation podem estar em falta!</translation>
     </message>
 </context>
 <context>
-    <name>MergeDives</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="804"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="804"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="804"/>
-        <source>merge dive</source>
-        <translation>juntar mergulho</translation>
-    </message>
-</context>
-<context>
-    <name>MultiFilter</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="637"/>
-        <source>Filter shows %1 (of %2) dives</source>
-        <translation>O filtro mostra %1 (de %2) mergulhos</translation>
-    </message>
-</context>
-<context>
     <name>OstcFirmwareCheck</name>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Deve actualizar o firmware no seu computador de mergulho: tem a versão %1 mas a última versão estável é a %2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="301"/>
         <source>
 
 If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source>
@@ -10902,41 +6663,26 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="302"/>
         <source>Not now</source>
         <translation>Agora não</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="303"/>
         <source>Update firmware</source>
         <translation>Actualizar firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="305"/>
         <source>Firmware upgrade notice</source>
         <translation>Alerta de upgrade de firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="323"/>
         <source>Save the downloaded firmware as</source>
         <translation>Gravar o firmware transferido como</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="324"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="324"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="324"/>
         <source>Firmware files</source>
         <translation>Ficheiros de firmware</translation>
     </message>
@@ -10968,7 +6714,7 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
 <context>
     <name>PasteDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="733"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="760"/>
         <source>Paste onto %n dive(s)</source>
         <translation><numerusform>Colar em %1 mergulho</numerusform><numerusform>Colar em %n mergulhos</numerusform></translation>
     </message>
@@ -10977,121 +6723,73 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     <name>PlannerSettingsWidget</name>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="544"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="544"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="544"/>
         <source>Last stop at 20ft</source>
         <translation>Última paragem aos 20 ft</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="562"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="545"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="545"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="545"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% da profundidade média para 6 m/20 ft</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="563"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="546"/>
         <source>20ft to surface</source>
         <translation>6 m/20 ft para a superfície</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="547"/>
         <source>ft</source>
         <translation>pé</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="550"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="550"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="550"/>
         <source>Last stop at 6m</source>
         <translation>Última paragem aos 6 m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="568"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="551"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="551"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="551"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% da profundidade média para 6 m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="569"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="552"/>
         <source>6m to surface</source>
         <translation>6 m para a superfície</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="570"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="556"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="557"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="556"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="557"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="556"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="557"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="582"/>
         <location filename="../desktop-widgets/diveplanner.cpp" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="565"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="565"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="565"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="566"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="575"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="575"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="597"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="580"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="580"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="580"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -11100,44 +6798,29 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     <name>PreferencesDefaults</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="329"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Listas e tabelas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="29"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="331"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="39"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="332"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="52"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="333"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
@@ -11149,54 +6832,36 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Ficheiro de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="76"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="335"/>
         <source>&amp;No default file</source>
         <translation>&amp;Sem ficheiro por defeito</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Ficheiro &amp;local por defeito</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Ficheiro rem&amp;oto por defeito</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Ficheiro de logbook local</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Use o padrão</translation>
@@ -11204,12 +6869,6 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -11217,141 +6876,103 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Mostrar inválidos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Garrafa padrão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Usar a garrafa padrão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="179"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="345"/>
         <source>Animations</source>
         <translation>Animações</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="188"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="346"/>
         <source>Speed</source>
         <translation>Velocidade</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Miniaturas vídeo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>executável ffmpeg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="251"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="251"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Extrair na posição</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Extrair miniaturas vídeo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Limpar definições</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Limpar lista de computadores de mergulho memorizados</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Restaurar todas as definições para o seu valor padrão</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="14"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Open default log file</source>
         <translation>Abrir ficheiro de registo de mergulhos padrão</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Subsurface files</source>
         <translation>Ficheiros do Subsurface</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
+        <source>Warning</source>
+        <translation>Aviso</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>Não foi possível executar o ffmpeg na localização especificada. A visualização das miniaturas não é possível.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="70"/>
         <source>Select ffmpeg executable</source>
         <translation>Seleccionar executável ffmpeg</translation>
     </message>
@@ -11360,8 +6981,6 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     <name>PreferencesDialog</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferencesdialog.cpp" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferencesdialog.cpp" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferencesdialog.cpp" line="42"/>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
@@ -11370,18 +6989,12 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     <name>PreferencesGeoreference</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_georeference.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_georeference.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_georeference.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_georeference.h" line="105"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_georeference.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_georeference.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Esquema de nomenclatura dos locais de mergulho</translation>
@@ -11389,12 +7002,6 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     <message>
         <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="42"/>
         <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_georeference.ui" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_georeference.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_georeference.ui" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_georeference.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_georeference.ui" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_georeference.ui" line="59"/>
         <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>
@@ -11402,9 +7009,6 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_georeference.cpp" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_georeference.cpp" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_georeference.cpp" line="10"/>
         <source>Georeference</source>
         <translation>Georreferenciar</translation>
     </message>
@@ -11413,117 +7017,78 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     <name>PreferencesGraph</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="337"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="20"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="338"/>
         <source>Gas pressure display setup</source>
         <translation>Configuração das pressões dos gases</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Opções para CCR:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="239"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="239"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="239"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Configuração do tecto de descompressão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="314"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="314"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Desenhar a vermelho o tecto calculado  pelo computador de mergulho </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Algoritmo para calcular o tecto de descompressão:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="245"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="362"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="341"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="341"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="341"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="341"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="371"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Opções pSCR:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Relação de diluição</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
         <translation>Limites para pO₂ (mínima, máxima)</translation>
@@ -11535,24 +7100,6 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="98"/>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="121"/>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="145"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="340"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="341"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="343"/>
@@ -11564,117 +7111,78 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="65"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="342"/>
         <source>Threshold for pN₂ (maximum only)</source>
         <translation>Limite para a pN₂ (apenas valor máximo)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="88"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="344"/>
         <source>Threshold for pHe (maximum only)</source>
         <translation>Limite para a pHe (apenas valor máximo)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="111"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="346"/>
         <source>pO₂ in calculating MOD (maximum only )</source>
         <translation>pO₂ usado para calcular MOD (apenas valor máximo)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
         <translation>Setpoint padrão para o plano de mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="161"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="351"/>
         <source>Show O₂ sensor values when viewing pO₂</source>
         <translation>Mostrar valores do sensor de O₂ quando a visualizar a pO₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="168"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="352"/>
         <source>Show CCR setpoints when viewing pO₂</source>
         <translation>Mostrar valores dos setpoits do CCR ao visualizar a pO₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="182"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="182"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="182"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Taxa metabólica do consumo de O₂ para o pSCR</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
         <translation>Mostrar o equivalente da pO₂ em circuito aberto com a pO₂ do pSCR </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="229"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="360"/>
         <source>Show warnings for isobaric counterdiffusion</source>
         <translation>Mostrar avisos de contradifusão hiperbárica</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Nível de conservacionismo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Recalcular miniaturas se forem mais antigas do que o ficheiro multimedia</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="255"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="363"/>
         <source>B&amp;ühlmann</source>
         <translation>B&amp;ühlmann</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -11682,12 +7190,6 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="275"/>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="328"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="365"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="370"/>
         <source>%</source>
@@ -11695,45 +7197,30 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="321"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="321"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="354"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="372"/>
         <source>Misc</source>
         <translation>Diversos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Mostrar garrafas não usadas na página do equipamento</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Mostrar profundidade média no Perfil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="12"/>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
@@ -11742,54 +7229,36 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     <name>PreferencesLanguage</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="178"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="26"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="179"/>
         <source>UI language</source>
         <translation>Língua do interface de utilizador</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="32"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="180"/>
         <source>Use system default</source>
         <translation>Usar o padrão do sistema</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="55"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="181"/>
         <source>Filter</source>
         <translation>Filtros</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="74"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="182"/>
         <source>Date format</source>
         <translation>Formato para a data</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.6/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;Formato de data preferido. Campos mais utilizados&lt;/p&gt;&lt;p&gt;d (dia do mês)&lt;/p&gt;&lt;p&gt;ddd (abreviatura do dia)&lt;/p&gt;&lt;p&gt;M (número do mês)&lt;/p&gt;&lt;p&gt;MMM (abreviatura do mês)&lt;/p&gt;&lt;p&gt;yy/yyyy (anp em 2/4 dígitos)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -11797,12 +7266,6 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="80"/>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="138"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="183"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="192"/>
         <source>Use UI language default</source>
@@ -11810,69 +7273,45 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="90"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="185"/>
         <source>This is used in places where there is less space to show the full date</source>
         <translation>Isto é usado em locais onde existe menos espaço para mostrar a data completa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="93"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="187"/>
         <source>Short format</source>
         <translation>Formato curto</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="132"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="191"/>
         <source>Time format</source>
         <translation>Formato de hora</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="151"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="151"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="151"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="151"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="194"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred time format&lt;/p&gt;&lt;p&gt;Commonly used format specifiers are&lt;/p&gt;&lt;p&gt;h (hours in 12h format)&lt;/p&gt;&lt;p&gt;H (hours in 24h format)&lt;/p&gt;&lt;p&gt;mm (2 digit minutes)&lt;/p&gt;&lt;p&gt;ss (2 digit seconds)&lt;/p&gt;&lt;p&gt;t/tt (a/p or am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Formato de hora preferido&lt;/p&gt;&lt;p&gt;Formatos mais comuns são&lt;/p&gt;&lt;p&gt;h (horas no formato 12 h)&lt;/p&gt;&lt;p&gt;H (horas no formato 24 h)&lt;/p&gt;&lt;p&gt;mm (minutos em 2 dígitos)&lt;/p&gt;&lt;p&gt;ss (segundos em 2 dígitos)&lt;/p&gt;&lt;p&gt;t/tt (a/p ou am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="13"/>
         <source>Language</source>
         <translation>Língua</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="75"/>
         <source>Restart required</source>
         <translation>É necessário reiniciar a aplicação</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="76"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Para alterar a linguagem é necessário reiniciar o Subsurface.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="94"/>
         <source>These will be used as is. This might not be what you intended.
 See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
         <translation>Serão usados tal como estão. Isto pode não ser o que pretende.
@@ -11881,20 +7320,11 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="103"/>
         <source>Literal characters</source>
         <translation>Caracteres literais</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="98"/>
         <source>Non-special character(s) in time format.
 </source>
         <translation>Caracter(es) não-especiais no formato de hora.
@@ -11902,9 +7332,6 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="104"/>
         <source>Non-special character(s) in date format.
 </source>
         <translation>Caracter(es) não-especiais no formato de data.</translation>
@@ -11914,54 +7341,36 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     <name>PreferencesNetwork</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="233"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="32"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="235"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="39"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="236"/>
         <source>Host</source>
         <translation>Servidor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="46"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="237"/>
         <source>Proxy type</source>
         <translation>Tipo de proxy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="56"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="238"/>
         <source>Username</source>
         <translation>Nome de utilizador</translation>
@@ -11969,12 +7378,6 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="108"/>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -11982,151 +7385,94 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="134"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="240"/>
         <source>Requires authentication</source>
         <translation>Requer autenticação</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="156"/>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="139"/>
         <source>Subsurface cloud storage</source>
         <translation>Armazenamento remoto do Subsurface</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Endereço de email</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Verificação do PIN</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Nova palavra-passe</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Gravar a palavra-passe localmente?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="11"/>
         <source>Network</source>
         <translation>Rede</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>No proxy</source>
         <translation>Sem proxy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>System proxy</source>
         <translation>Proxy do sistema</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="19"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Alteração ignorada. Os campos &quot;email&quot; e &quot;password&quot; da conta de armazenamento remoto só podem ser compostos por letras, números e &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, e &apos;+&apos;.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Alteração ignorada. Os campos &quot;email&quot; e &quot;password&quot; da conta de armazenamento remoto só podem ser compostos por letras, números e &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, e &apos;+&apos;.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>O endereço de email e a palavra-chave para o armazenamento remoto apenas pode conter letras, números e &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, e &apos;+&apos;.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="133"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Armazenamento remoto do Subsurface (credenciais verificadas)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="135"/>
         <source>Subsurface cloud storage (incorrect password)</source>
         <translation>Armazenamento remoto do Subsurface (palavra-passe incorrecta)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="137"/>
         <source>Subsurface cloud storage (PIN required)</source>
         <translation>Armazenamento remoto do Subsurface (necessário o PIN)</translation>
     </message>
@@ -12135,342 +7481,228 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     <name>PreferencesUnits</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="346"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="20"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="347"/>
         <source>Unit system</source>
         <translation>Sistema de unidades</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="26"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="348"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="33"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="349"/>
         <source>&amp;Metric</source>
         <translation>&amp;Métrico</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="40"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="350"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="47"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="351"/>
         <source>Personali&amp;ze</source>
         <translation>Personali&amp;zar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="57"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="352"/>
         <source>Individual settings</source>
         <translation>Configurações individuais</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="69"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="353"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="76"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="354"/>
         <source>meter</source>
         <translation>metro</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="86"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="355"/>
         <source>feet</source>
         <translation>pé</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="96"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="356"/>
         <source>Pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="103"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="357"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="113"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="358"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="123"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="359"/>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="130"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="360"/>
         <source>&amp;liter</source>
         <translation>&amp;litro</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="140"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="361"/>
         <source>cuft</source>
         <translation>pé cúbico</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="150"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="362"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="157"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="363"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="167"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="364"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="177"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="365"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="184"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="366"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="194"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="367"/>
         <source>lbs</source>
         <translation>libra</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="207"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="368"/>
         <source>Time units</source>
         <translation>Unidades de tempo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="213"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="369"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Denominador para a velocidade de subida/descida</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="220"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="370"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="227"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="371"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="237"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="237"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="237"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="237"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="372"/>
         <source>Duration units</source>
         <translation>Unidades para a duração</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="243"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="373"/>
         <source>Show hours in duration</source>
         <translation>Mostrar horas na duração</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="250"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="374"/>
         <source>hh:mm (always)</source>
         <translation>hh:mm (sempre)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="257"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="375"/>
         <source>mm (always)</source>
         <translation>mm (sempre)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="264"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="376"/>
         <source>mm (for dives shorter than 1 hour), hh:mm (otherwise)</source>
         <translation>mm (para mergulhos inferiores a 1 hora), hh:mm (nos restantes casos)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="274"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="274"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="274"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="377"/>
         <source>Dive list table</source>
         <translation>Tabela de mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="280"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="280"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="280"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="378"/>
         <source>Show units in dive list table</source>
         <translation>Mostrar unidades na tabela de mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="290"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="290"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="290"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="379"/>
         <source>GPS coordinates</source>
         <translation>Coordenadas GPS</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="296"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="380"/>
         <source>Location Display</source>
         <translation>Apresentação dos locais</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="303"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="381"/>
         <source>traditional (dms)</source>
         <translation>tradicional (gms)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="310"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="382"/>
         <source>decimal</source>
         <translation>decimal</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.cpp" line="7"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.cpp" line="7"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Unidades</translation>
     </message>
@@ -12479,25 +7711,16 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     <name>PrintDialog</name>
     <message>
         <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printdialog.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printdialog.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printdialog.cpp" line="104"/>
         <source>P&amp;rint</source>
         <translation>Im&amp;primir</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printdialog.cpp" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printdialog.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printdialog.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printdialog.cpp" line="107"/>
         <source>&amp;Preview</source>
         <translation>&amp;Previsão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printdialog.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printdialog.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printdialog.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printdialog.cpp" line="119"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -12506,99 +7729,66 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     <name>PrintOptions</name>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="29"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="168"/>
         <source>Print type</source>
         <translation>Tipo de impressão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="41"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="169"/>
         <source>&amp;Dive list print</source>
         <translation>Imprimir &amp;lista de mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="57"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="170"/>
         <source>&amp;Statistics print</source>
         <translation>Imprimir e&amp;statísticas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="67"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="171"/>
         <source>Print options</source>
         <translation>Opções de impressão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="79"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="172"/>
         <source>Print only selected dives</source>
         <translation>Imprimir apenas os mergulhos seleccionados</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="92"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="173"/>
         <source>Print in color</source>
         <translation>Imprimir a cores</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="102"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="174"/>
         <source>Template</source>
         <translation>Modelo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="127"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="175"/>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="134"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="176"/>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="141"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="177"/>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="148"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="178"/>
         <source>Import</source>
         <translation>Importar</translation>
@@ -12608,26 +7798,11 @@ Veja http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
         <location filename="../desktop-widgets/printoptions.cpp" line="158"/>
         <location filename="../desktop-widgets/printoptions.cpp" line="194"/>
         <location filename="../desktop-widgets/printoptions.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="226"/>
         <source>Read-only template!</source>
         <translation>Modelo de leitura apenas!</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="132"/>
         <source>The template '%1' is read-only and cannot be edited.
 Please export this template to a different file.</source>
         <translation>O modelo &apos;%1&apos; é de leitura apenas e não pode ser editado.
@@ -12635,65 +7810,38 @@ Por favor exporte o modelo para outro ficheiro.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="148"/>
         <source>Import template file</source>
         <translation>Importar modelo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="149"/>
         <location filename="../desktop-widgets/printoptions.cpp" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="180"/>
         <source>HTML files</source>
         <translation>Ficheiros HTML</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="159"/>
         <location filename="../desktop-widgets/printoptions.cpp" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="195"/>
         <source>The destination template &apos;%1&apos; is read-only and cannot be overwritten.</source>
         <translation>O modelo de destino &apos;%1&apos; é de leitura apenas e não pode ser substituído.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="179"/>
         <source>Export template files as</source>
         <translation>Exportar modelo como</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="219"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="219"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="219"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="219"/>
         <source>This action cannot be undone!</source>
         <translation>Esta acção não pode ser desfeita!</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="220"/>
         <source>Delete template &apos;%1&apos;?</source>
         <translation>Apagar o modelo &apos;%1&apos;?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="227"/>
         <source>The template &apos;%1&apos; is read-only and cannot be deleted.</source>
         <translation>O modelo &apos;%1&apos; é de leitura apenas e não pode ser editado.</translation>
     </message>
@@ -12702,218 +7850,137 @@ Por favor exporte o modelo para outro ficheiro.</translation>
     <name>ProfileWidget2</name>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="814"/>
         <source> (#%1 of %2)</source>
         <translation>(#%1 of %2)</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="810"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="810"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="810"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="810"/>
         <source>Unknown dive computer</source>
         <translation>Computador de mergulho desconhecido</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="840"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="840"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="840"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="840"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="837"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>A visualização do NDL /TTS foi desactivada devido ao excessivo tempo de processamento</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1452"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1452"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1452"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1451"/>
         <source>Add gas change</source>
         <translation>Adicionar mudança de gás</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1438"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1438"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1438"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1435"/>
         <source>Make first dive computer</source>
         <translation>Marca do computador de mergulho principal</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="806"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="806"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="806"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="806"/>
         <source>Planned dive</source>
         <translation>Mergulho planeado</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="808"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="808"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="808"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="808"/>
         <source>Manually added dive</source>
         <translation>Mergulho adicionado manualmente</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1440"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1440"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1440"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1440"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
         <source>Delete this dive computer</source>
         <translation>Apagar este computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1441"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Split this dive computer into own dive</source>
         <translation>Separar este computador de mergulho num outro mergulho</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1457"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1455"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1455"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1455"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
         <source> (cyl. %1)</source>
         <translation>(garr. %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1463"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1461"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1461"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1461"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
         <source>Add setpoint change</source>
         <translation>Adicionar mudança no setpoint</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1465"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1463"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1463"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1463"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1462"/>
         <source>Add bookmark</source>
         <translation>Adicionar marcador</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1467"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1465"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1465"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1465"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1464"/>
         <source>Split dive into two</source>
         <translation>Dividir mergulho em dois</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1477"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1475"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1475"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1475"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
         <source>Change divemode</source>
         <translation>Mudar modo de mergulho</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1501"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1499"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1499"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1499"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1498"/>
         <source>Edit the profile</source>
         <translation>Editar o perfil</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1505"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1503"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1503"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1503"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1502"/>
         <source>Remove event</source>
         <translation>Remover evento</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1508"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1508"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1508"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1507"/>
         <source>Hide similar events</source>
         <translation>Esconder eventos semelhantes</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1517"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1515"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1515"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
         <source>Edit name</source>
         <translation>Editar nome</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1548"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1555"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1546"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1553"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1546"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1553"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1546"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1553"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1545"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1552"/>
         <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source>
         <translation>Ajustar a pressão da garrafa %1 (presentemente interpolada como %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1570"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1568"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1568"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1568"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1567"/>
         <source>Unhide all events</source>
         <translation>Mostrar todos os eventos</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1603"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1603"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1603"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide events</source>
         <translation>Ocultar eventos</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1603"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1603"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1603"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide all %1 events?</source>
         <translation>Ocultar todos os %1 eventos?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1638"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1638"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1630"/>
         <source>Remove the selected event?</source>
         <translation>Remover o evento seleccionado?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1639"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1639"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1631"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1787"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1792"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1792"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1792"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1783"/>
         <source>Edit name of bookmark</source>
         <translation>Editar nome do marcador</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1788"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1793"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1793"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1793"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1784"/>
         <source>Custom name:</source>
         <translation>Nome personalizado:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1793"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1798"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1798"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1798"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1789"/>
         <source>Name is too long!</source>
         <translation>O nome é demasiado comprido!</translation>
     </message>
@@ -12921,242 +7988,151 @@ Por favor exporte o modelo para outro ficheiro.</translation>
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="205"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="207"/>
         <source>Starting...</source>
         <translation>A inicial...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="259"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/>
         <source>Open local dive data file</source>
         <translation>Abrir ficheiro local com dados de mergulho</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="267"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Opening local data file failed</source>
         <translation>Não foi possível abrir o ficheiro local</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="297"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="297"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="297"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/>
         <source>%1 dives loaded from local dive data file</source>
         <translation>%1 mergulhos carregados a partir do ficheiro local</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="395"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/>
         <source>working in no-cloud mode</source>
         <translation>A trabalhar em modo local</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="399"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="425"/>
         <source>Error parsing local storage, giving up</source>
         <translation>Erro na análise do armazenamento local, a cancelar</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="427"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="408"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="434"/>
         <source>no cloud credentials</source>
         <translation>Não existem credenciais da nuvem</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="428"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="485"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>Por favor insira credenciais de nuvem válidas</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="441"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation>O endereço de email e a palavra-chave para o armazenamento remoto apenas pode conter letras, números e &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, e &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="447"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="447"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="447"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="473"/>
         <source>Invalid format for email address</source>
         <translation>Formato de endereço de correio electrónico inválido</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="496"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>A tentar abrir o armazenamento remoto com as novas credenciais</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="518"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="544"/>
         <source>Testing cloud credentials</source>
         <translation>A testar as credenciais da nuvem</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="533"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="559"/>
         <source>No response from cloud server to validate the credentials</source>
         <translation>Não houve resposta do servidor remoto para validar as credenciais</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="541"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="567"/>
         <source>Incorrect cloud credentials</source>
         <translation>Credenciais remotas inválidas</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="547"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation>Não foi possível ligar-se ao armazenamento remoto - conta remota não verificada</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="593"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="574"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="600"/>
         <source>Cloud credentials are invalid</source>
         <translation>As credenciais são inválidas</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="607"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="588"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="588"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="588"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>Não foi possível abrir o armazenamento remoto: erro ao criar a ligação HTTPS</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="602"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="602"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="602"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="628"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>Não é possível abrir o armazenamento remoto: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="634"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="615"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="615"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="615"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="641"/>
         <source>Cannot connect to cloud storage</source>
         <translation>Não é possível ligar-se com o armazenamento remoto</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="620"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="620"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="620"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="646"/>
         <source>Cloud credentials valid, loading dives...</source>
         <translation>Credenciais remotas válidas, a carregar os mergulhos...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="649"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="630"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="630"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="630"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="656"/>
         <source>Cloud storage error: %1</source>
         <translation>Erro no armazenamento remoto: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="676"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="676"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="676"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="702"/>
         <source>Loading dives from local storage (&apos;no cloud&apos; mode)</source>
         <translation>A carregar mergulhos do armazenamento local (modo &apos;no cloud&apos;)</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="722"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="748"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>Falha na ligação ao servidor remoto. A passar para modo local</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="766"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="747"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="747"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="747"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>Armazenamento remoto aberto com sucesso. Não existem mergulhos na lista.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="921"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="922"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="919"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="920"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="919"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="920"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="942"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="921"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="922"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="923"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="919"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="920"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="921"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="919"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="920"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="921"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="953"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="921"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="919"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="919"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
         <source>sec</source>
         <translation>seg</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1479"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="1350"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="1348"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="1348"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1048"/>
+        <source>weight</source>
+        <translation>peso</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1493"/>
         <source>Unknown GPS location</source>
         <translation>Localização GPS desconhecida</translation>
     </message>
@@ -13165,9 +8141,6 @@ Por favor exporte o modelo para outro ficheiro.</translation>
     <name>QMLPrefs</name>
     <message>
         <location filename="../mobile-widgets/qmlprefs.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlprefs.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlprefs.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlprefs.cpp" line="138"/>
         <source>Starting...</source>
         <translation>A iniciar...</translation>
     </message>
@@ -13175,129 +8148,60 @@ Por favor exporte o modelo para outro ficheiro.</translation>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2151"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2151"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2151"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2151"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2153"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2148"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2148"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2148"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2148"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2131"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2139"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2150"/>
         <source>Failed!</source>
         <translation>Falhou!</translation>
     </message>
 </context>
 <context>
-    <name>RemoveAutogenTrips</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="688"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="688"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="688"/>
-        <source>remove autogenerated trips</source>
-        <translation>remover viagens criadas automaticamente</translation>
-    </message>
-</context>
-<context>
-    <name>RemoveDivesFromTrip</name>
-    <message numerus="yes">
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="680"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="680"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="680"/>
-        <source>remove %n dive(s) from trip</source>
-        <translation><numerusform>remover mergulho da viagem</numerusform><numerusform>remover %n mergulhos da viagem</numerusform></translation>
-    </message>
-</context>
-<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/renumber.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/renumber.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/renumber.ui" line="17"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="88"/>
         <source>Renumber</source>
         <translation>Renumerar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/renumber.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/renumber.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/renumber.ui" line="43"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="89"/>
         <source>Renumbering all dives</source>
         <translation>A renumerar todos os mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="137"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="139"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="150"/>
         <source>New starting number</source>
         <translation>Novo número inicial</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="148"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="137"/>
         <source>New number</source>
         <translation>Novo número</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="153"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
         <source>Renumber selected dives</source>
         <translation>Renumerar os mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="155"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="144"/>
         <source>Renumber all dives</source>
         <translation>Renumerar todos os mergulhos</translation>
     </message>
 </context>
 <context>
-    <name>RenumberDives</name>
-    <message numerus="yes">
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="640"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="640"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="640"/>
-        <source>renumber %n dive(s)</source>
-        <translation><numerusform>renumerar mergulho</numerusform><numerusform>renumerar %n mergulhos</numerusform></translation>
-    </message>
-</context>
-<context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2248"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2248"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2248"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2248"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2250"/>
         <source>Reset settings failed!</source>
         <translation>A reinicialização das configurações falhou!</translation>
     </message>
@@ -13306,9 +8210,6 @@ Por favor exporte o modelo para outro ficheiro.</translation>
     <name>SearchBar</name>
     <message>
         <location filename="../desktop-widgets/searchbar.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/searchbar.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/searchbar.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/searchbar.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_searchbar.h" line="120"/>
         <source>Form</source>
         <translation>Formulário</translation>
@@ -13318,27 +8219,18 @@ Por favor exporte o modelo para outro ficheiro.</translation>
     <name>SetpointDialog</name>
     <message>
         <location filename="../desktop-widgets/setpoint.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/setpoint.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/setpoint.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/setpoint.ui" line="17"/>
         <location filename="../subsurface/desktop-widgets/ui_setpoint.h" line="82"/>
         <source>Add setpoint change</source>
         <translation>Adicionar mudança no setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/setpoint.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/setpoint.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/setpoint.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/setpoint.ui" line="43"/>
         <location filename="../subsurface/desktop-widgets/ui_setpoint.h" line="83"/>
         <source>New setpoint (0 for OC)</source>
         <translation>Novo setpoint (0 para CA)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/setpoint.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/setpoint.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/setpoint.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/setpoint.ui" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_setpoint.h" line="84"/>
         <source>bar</source>
         <translation>bar</translation>
@@ -13348,105 +8240,66 @@ Por favor exporte o modelo para outro ficheiro.</translation>
     <name>Settings</name>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="16"/>
         <source>Settings</source>
         <translation>Definições</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="20"/>
         <source>Undefined</source>
         <translation>Indefinido</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="21"/>
         <source>Incorrect username/password combination</source>
         <translation>Combinação nome de utilizador/palavra-chave incorrecta</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="22"/>
         <source>Credentials need to be verified</source>
         <translation>As credenciais precisam de ser verificadas</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="23"/>
         <source>Credentials verified</source>
         <translation>Credenciais verificadas</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="24"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="24"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="24"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="24"/>
         <source>No cloud mode</source>
         <translation>Modo local </translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="33"/>
         <source>Cloud status</source>
         <translation>Estado do armazenamento remoto</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="42"/>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="47"/>
         <source>Not applicable</source>
         <translation>Não aplicável</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="53"/>
         <source>Change</source>
         <translation>Alterar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="60"/>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="84"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="84"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="84"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="84"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="93"/>
         <source>Blue</source>
         <translation>Azul</translation>
     </message>
@@ -13454,15 +8307,6 @@ Por favor exporte o modelo para outro ficheiro.</translation>
         <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"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="218"/>
         <source>regular text</source>
         <translation>texto</translation>
     </message>
@@ -13470,175 +8314,106 @@ Por favor exporte o modelo para outro ficheiro.</translation>
         <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"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="234"/>
         <source>Highlight</source>
         <translation>Salientar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="148"/>
         <source>Pink</source>
         <translation>Rosa</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="202"/>
         <source>Dark</source>
         <translation>Escuro</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="255"/>
         <source>Scaling</source>
         <translation>Escala</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="268"/>
         <source>smaller</source>
         <translation>mais pequeno</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="276"/>
         <source>regular</source>
         <translation>tamanho normal</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="284"/>
         <source>larger</source>
         <translation>maior</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="306"/>
         <source>GPS location service</source>
         <translation>Serviço de localização GPS</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="316"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="316"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="316"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="316"/>
         <source>Distance threshold (meters)</source>
         <translation>Distância mínima (m)</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="332"/>
         <source>Time threshold (minutes)</source>
         <translation>Duração mínima (minuto)</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="361"/>
         <source>Default Cylinder</source>
         <translation>Garrafa preferida</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="370"/>
         <source>Cylinder:</source>
         <translation>Garrafa:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="395"/>
         <source>Dive computers</source>
         <translation>Computadores de mergulho</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="404"/>
         <source>Forget remembered dive computers</source>
         <translation>Esquecer computadores de mergulho memorizados</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="410"/>
         <source>Forget</source>
         <translation>Esquecer</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="432"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="432"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="432"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="432"/>
         <source>Units</source>
         <translation>Unidades</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="442"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="442"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="442"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="442"/>
         <source>Use Imperial Units</source>
         <translation>Usar sistema de unidades imperial</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="458"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="458"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="458"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="458"/>
         <source>Use Metric Units</source>
         <translation>Usar sistema de unidades métrico</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="486"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="486"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="486"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="486"/>
         <source>Filter preferences</source>
         <translation>Filtrar preferências</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="495"/>
         <source>Include notes in full text filtering</source>
         <translation>Incluir as notas no filtro de texto</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="510"/>
         <source>Match filter case sensitive</source>
         <translation>Ter em conta letras maiúsculas/minúsculas</translation>
     </message>
@@ -13656,17 +8431,11 @@ mesmo que não reconhecidos como computadores de mergulho</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="572"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="537"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="537"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="537"/>
         <source>Developer</source>
         <translation>Desenvolvedores</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="582"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="547"/>
         <source>Display Developer menu</source>
         <translation>Mostrar o menu do programador</translation>
     </message>
@@ -13675,54 +8444,36 @@ mesmo que não reconhecidos como computadores de mergulho</translation>
     <name>ShiftImageTimesDialog</name>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="23"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="194"/>
         <source>Shift selected image times</source>
         <translation>Deslocar os tempos seleccionados</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="195"/>
         <source>Shift times of image(s) by</source>
         <translation>Alterar horas da(s) imagem(ns) em</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="95"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="196"/>
         <source>h:mm</source>
         <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="105"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="105"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="197"/>
         <source>Earlier</source>
         <translation>Mais cedo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="112"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="198"/>
         <source>Later</source>
         <translation>Mais tarde</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="128"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="199"/>
         <source>Warning!
 Not all media files have timestamps in the range between
@@ -13733,151 +8484,93 @@ entre 30 minutos antes do início e 30 minutos depois do final de qualquer mergu
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="137"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="202"/>
         <source>Load media files even if the time does not match the dive time</source>
         <translation>Carregar ficheiros multimedia mesmo que a hora de criação não corresponda ao tempo do mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="186"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="204"/>
         <source>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive compuer displaying the current time. Download that image to your computer and press this button.</source>
         <translation>Para calcular a diferença entre os relógios do seu computador de mergulho e a sua câmara, use a câmara para tirar uma fotografia do seu computador de mergulho onde se veja a hora actual. Transfira a imagem para o seu PC e prima este botão.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="196"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="206"/>
         <source>Determine camera time offset</source>
         <translation>Determinar a diferença de tempo da câmara</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="199"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="199"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="199"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="199"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="208"/>
         <source>Select image of divecomputer showing time</source>
         <translation>Seleccionar imagem do computador de mergulho em que se vejam as horas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="221"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="210"/>
         <source>Which date and time are displayed on the image?</source>
         <translation>Que data e hora estão representados na imagem?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="296"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="285"/>
         <source>Open image file</source>
         <translation>Abrir imagem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="285"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="297"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="297"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="298"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="287"/>
         <source>Image files</source>
         <translation>Ficheiros de imagem</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="366"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="379"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="368"/>
         <source>Selected dive date/time</source>
         <translation>Data/hora de mergulho seleccionada</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="368"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="381"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
         <source>First selected dive date/time</source>
         <translation>Primeira data/hora de mergulho seleccionada</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="382"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="371"/>
         <source>Last selected dive date/time</source>
         <translation>Ùltima data/hora de mergulho seleccionada</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="384"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/>
         <source>
 Files with inappropriate date/time</source>
         <translation>Ficheiros com data/hora inapropriada</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="394"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="383"/>
         <source>No Exif date/time found</source>
         <translation>Não foram encontrados dados Exif de data/hora</translation>
     </message>
 </context>
 <context>
-    <name>ShiftTime</name>
-    <message numerus="yes">
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="597"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="597"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="597"/>
-        <source>shift time of %n dives</source>
-        <translation><numerusform>deslocar tempos do mergulho</numerusform><numerusform>deslocar tempos de %n mergulhos</numerusform></translation>
-    </message>
-</context>
-<context>
     <name>ShiftTimesDialog</name>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="23"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="136"/>
         <source>Shift selected dive times</source>
         <translation>Deslocar os tempos seleccionados</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="49"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="137"/>
         <source>Shift times of selected dives by</source>
         <translation>Deslocar os tempos dos mergulhos seleccionados em</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="72"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="138"/>
         <source>Shifted time:</source>
         <translation>Hora alterada:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="79"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="139"/>
         <source>Current time:</source>
         <translation>Hora actual:</translation>
@@ -13885,12 +8578,6 @@ Files with inappropriate date/time</source>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="86"/>
         <location filename="../desktop-widgets/shifttimes.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="93"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="140"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="141"/>
         <source>0:0</source>
@@ -13898,27 +8585,18 @@ Files with inappropriate date/time</source>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="126"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="142"/>
         <source>h:mm</source>
         <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="136"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="143"/>
         <source>Earlier</source>
         <translation>Mais cedo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="143"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="144"/>
         <source>Later</source>
         <translation>Mais tarde</translation>
@@ -13928,318 +8606,81 @@ Files with inappropriate date/time</source>
     <name>Smrtk2ssrfcWindow</name>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="20"/>
         <source>SmartTrak files importer</source>
         <translation>Importador de ficheiros SmartTrak</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="79"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="111"/>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="177"/>
         <source>Choose</source>
         <translation>Escolha</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="133"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="242"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="270"/>
         <source>Import</source>
         <translation>Importar</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Select the .slg file(s) you want to import to Subsurface format, and the exported .xml file. It&apos;s advisable to use a new output file, as its actual content will be erased.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Seleccione o(s) ficheiro(s) .slg que pretende importar para o formato Subsurface, e o ficheiro.xml a exportar. É aconselhável usar um ficheiro de saída novo, já que os seus conteúdos irão ser eliminados.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="377"/>
         <source>Import messages (errors, warnings, etc)</source>
         <translation>Importar mensagens (erros, avisos, etc.)</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
         <source>Open SmartTrak files</source>
         <translation>Abril ficheiros Smarttrak</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
         <source>SmartTrak files</source>
         <translation>Ficheiros SmartTrak</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>All files</source>
         <translation>Todos os ficheiros</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>Subsurface files</source>
         <translation>Ficheiros do Subsurface</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
         <source>Open Subsurface files</source>
         <translation>Abrir ficheiros Subsurface</translation>
     </message>
 </context>
 <context>
-    <name>SocialNetworkDialog</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/>
-        <source>Small</source>
-        <translation>Pequeno</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/>
-        <source>Medium</source>
-        <translation>Médio</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/>
-        <source>Dive date: %1 
-</source>
-        <translation>Data do mergulho: %1
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/>
-        <source>Duration: %1 
-</source>
-        <translation>Duração: %1
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/>
-        <source>h</source>
-        <comment>abbreviation for hours</comment>
-        <translation>h</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/>
-        <source>min</source>
-        <comment>abbreviation for minutes</comment>
-        <translation>min</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/>
-        <source>Dive location: %1 
-</source>
-        <translation>Local do mergulho: %1
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/>
-        <source>Buddy: %1 
-</source>
-        <translation>Companheiro: %1
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/>
-        <source>Divemaster: %1 
-</source>
-        <translation>Guia de mergulho: %1
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/>
-        <source>
-%1</source>
-        <translation>
-%1</translation>
-    </message>
-</context>
-<context>
-    <name>SocialnetworksDialog</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/>
-        <source>Small</source>
-        <translation>Pequeno</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/>
-        <source>Medium</source>
-        <translation>Médio</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/>
-        <source>Big</source>
-        <translation>Grande</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/>
-        <source>The text to the right will be posted as the description with your dive profile graph to Facebook. The album name is required (the profile graph will be posted to that album).</source>
-        <translation>O texto à direita será publicado como descrição do gráfico do seu perfil de mergulho no Facebook. O nome do álbum é necessário (o gráfico do perfil será colocado nesse álbum).</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/>
-        <source>Album</source>
-        <translation>Álbum</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="64"/>
-        <source>The profile picture will be posted in this album (required)</source>
-        <translation>A imagem do perfil será colocada neste álbum (requerido)</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="71"/>
-        <source>Include</source>
-        <translation>Incluir</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="78"/>
-        <source>Date and time</source>
-        <translation>Data e hora</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="85"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="92"/>
-        <source>Location</source>
-        <translation>Local</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="99"/>
-        <source>Divemaster</source>
-        <translation>Guia de mergulho</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="106"/>
-        <source>Buddy</source>
-        <translation>Companheiros</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="113"/>
-        <source>Notes</source>
-        <translation>Notas</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="126"/>
-        <source>Facebook post preview</source>
-        <translation>Previsão do post do Facebook</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/>
-        <source>Image Size</source>
-        <translation>Tamanho da imagem</translation>
-    </message>
-</context>
-<context>
-    <name>SplitDives</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="748"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="748"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="748"/>
-        <source>split dive</source>
-        <translation>dividir mergulho</translation>
-    </message>
-</context>
-<context>
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/StartPage.qml" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/StartPage.qml" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/StartPage.qml" line="37"/>
         <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>Para usar o a versão móvel do Subsurface com o armazenamento remoto, insira as suas credenciais da nuvem. &lt;br/&gt;&lt;br/&gt; Se esta é a primeira vez que utiliza o armazenamento remoto do Subsurface, insira um endereço de e-mail válido (tudo minúsculas) e uma palavra-passe à escolha (letras e números). &lt;br/&gt;&lt;br/&gt;Para usar a versão móvel do Subsurface apenas com os dados armazenados no dispositivo, seleccione o botão &quot;Armazenamento local&quot; acima.</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/StartPage.qml" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/StartPage.qml" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/StartPage.qml" line="50"/>
         <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>Obrigado pelo seu registo com o Subsurface. Enviámos &lt;b&gt;%1&lt;/b&gt; um PIN para completar o registo. Se não receber um e-mail nosso nos próximos 15 minutos, por favor verifique em primeiro lugar que o endereço está correcto e depois verifique a sua pasta de Spam.&lt;br/&gt;&lt;br/&gt;Em caso de problemas no registo da conta de armazenamento remoto, contacte o nosso fórum (https://subsurface-divelog.org/user-forum/).&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
@@ -14248,83 +8689,41 @@ Files with inappropriate date/time</source>
     <name>SubsurfaceAbout</name>
     <message>
         <location filename="../desktop-widgets/about.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/about.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/about.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/about.ui" line="23"/>
         <location filename="../subsurface/desktop-widgets/ui_about.h" line="118"/>
         <source>About Subsurface</source>
         <translation>Sobre o Subsurface</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/about.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/about.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/about.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/about.ui" line="83"/>
         <location filename="../subsurface/desktop-widgets/ui_about.h" line="121"/>
         <source>&amp;License</source>
         <translation>&amp;Licença</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/about.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/about.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/about.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/about.ui" line="90"/>
         <location filename="../subsurface/desktop-widgets/ui_about.h" line="122"/>
         <source>Credits</source>
         <translation>Créditos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/about.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/about.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/about.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/about.ui" line="97"/>
         <location filename="../subsurface/desktop-widgets/ui_about.h" line="123"/>
         <source>&amp;Website</source>
         <translation>&amp;Website</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/about.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/about.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/about.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/about.ui" line="104"/>
         <location filename="../subsurface/desktop-widgets/ui_about.h" line="124"/>
         <source>&amp;Close</source>
         <translation>&amp;Fechar</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/about.cpp" line="20"/>
-        <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2018&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1&lt;/span&gt;&lt;br&gt;&lt;br&gt;Programa de registo de mergulhos&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, e outros, 2011-2018&lt;/span&gt;</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/about.cpp" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/about.cpp" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/about.cpp" line="20"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2019&lt;/span&gt;</source>
         <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Software multi-plataforma de registo de mergulhos&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, e outros, 2011-2019&lt;/span&gt;</translation>
     </message>
 </context>
 <context>
-    <name>SuitFilter</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="598"/>
-        <source>Suits</source>
-        <translation>Fatos</translation>
-    </message>
-</context>
-<context>
-    <name>SuitsFilterModel</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/filtermodels.cpp" line="335"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/filtermodels.cpp" line="335"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/filtermodels.cpp" line="335"/>
-        <source>No suit set</source>
-        <translation>Fato não definido</translation>
-    </message>
-</context>
-<context>
     <name>TabDiveEquipment</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.ui" line="6"/>
@@ -14332,33 +8731,50 @@ Files with inappropriate date/time</source>
         <translation>Equipamento</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="48"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.ui" line="74"/>
+        <source>Suit</source>
+        <translation>Fato</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
         <source>Cylinders</source>
         <translation>Garrafas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="49"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
         <source>Add cylinder</source>
         <translation>Adicionar garrafa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="56"/>
         <source>Weights</source>
         <translation>Lastro</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/>
         <source>Add weight system</source>
         <translation>Adicionar sistema de lastro</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="60"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="64"/>
+        <source>Undo</source>
+        <translation>Reverter</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="306"/>
+        <source>Warning: edited %1 dives</source>
+        <translation>Aviso: editados %1 mergulhos</translation>
+    </message>
 </context>
 <context>
     <name>TabDiveExtraInfo</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveExtraInfo.h" line="49"/>
         <source>Extra Info</source>
         <translation>Informação extra</translation>
@@ -14368,90 +8784,60 @@ Files with inappropriate date/time</source>
     <name>TabDiveInformation</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="297"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="59"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="298"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="78"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="300"/>
         <source>Interval</source>
         <translation>Intervalo de superfície</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="97"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="302"/>
         <source>Gases used</source>
         <translation>Gases usados</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="116"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="304"/>
         <source>Gas consumed</source>
         <translation>Gás consumido</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="135"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="306"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="154"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="173"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="192"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="312"/>
         <source>Max. depth</source>
         <translation>Prof. Max.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="211"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="314"/>
         <source>Avg. depth</source>
         <translation>Prof. Média</translation>
@@ -14462,94 +8848,58 @@ Files with inappropriate date/time</source>
         <translation>Pressão atmosférica</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="230"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="316"/>
         <source>Air pressure</source>
         <translation>Pressão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="249"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="318"/>
         <source>Air temp.</source>
         <translation>Temp. do ar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="280"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="268"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="320"/>
         <source>Water temp.</source>
         <translation>Temp. da água</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="299"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="287"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="287"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="287"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="322"/>
         <source>Dive time</source>
         <translation>Duração do mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="318"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="306"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="324"/>
         <source>Water type</source>
         <translation>Tipo de água</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="71"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
         <source>sec</source>
         <translation>seg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
         <source>d</source>
         <translation>d</translation>
     </message>
@@ -14558,67 +8908,43 @@ Files with inappropriate date/time</source>
     <name>TabDivePhotos</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDivePhotos.h" line="78"/>
         <source>Photos</source>
         <translation>Fotos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDivePhotos.h" line="79"/>
         <source>Zoom level</source>
         <translation>Nível de zoom</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/>
         <source>Load media from file(s)</source>
         <translation>Carregar ficheiros multimedia a partir do(s) ficheiro(s)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/>
         <source>Load media file(s) from web</source>
         <translation>Carregar ficheiro(s) multimedia a partir da internet</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/>
         <source>Delete selected media files</source>
         <translation>Apagar os ficheiros multimedia seleccionados</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/>
         <source>Delete all media files</source>
         <translation>Apagar todos os ficheiros multimedia</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/>
         <source>Open folder of selected media files</source>
         <translation>Abrir pasta dos ficheiros multimedia seleccionados</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/>
         <source>Recalculate selected thumbnails</source>
         <translation>Recalcular as miniaturas seleccionadas</translation>
     </message>
@@ -14629,17 +8955,11 @@ Files with inappropriate date/time</source>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/>
         <source>Deleting media files</source>
         <translation>A apagar os ficheiros multimedia</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/>
         <source>Are you sure you want to delete all media files?</source>
         <translation>Tem a certeza que quer eliminar todos os ficheiros seleccionados?</translation>
     </message>
@@ -14667,35 +8987,23 @@ Files with inappropriate date/time</source>
     <name>TabDiveStatistics</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="194"/>
         <source>Statistics</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="195"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="128"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="200"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="97"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="197"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
@@ -14707,125 +9015,80 @@ Files with inappropriate date/time</source>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="109"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="198"/>
         <source>Total time</source>
         <translation>Tempo total</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="140"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="201"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="85"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="196"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="159"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="203"/>
         <source>Gas consumption</source>
         <translation>Gás consumido</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/>
         <source>Highest total SAC of a dive</source>
         <translation>Consumo mais elevado num mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Consumo mais baixo num mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Média do consumo para os mergulhos seleccionados</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/>
         <source>Highest temperature</source>
         <translation>Temperatura mais elevada</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/>
         <source>Lowest temperature</source>
         <translation>Temperatura mais baixa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/>
         <source>Average temperature of all selected dives</source>
         <translation>Média da temperatura nos mergulhos seleccionados</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/>
         <source>Deepest dive</source>
         <translation>Mergulho mais fundo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/>
         <source>Shallowest dive</source>
         <translation>Mergulho menos fundo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/>
         <source>Longest dive</source>
         <translation>Mergulho mais longo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/>
         <source>Shortest dive</source>
         <translation>Mergulho mais curto</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="22"/>
         <source>Average length of all selected dives</source>
         <translation>Duração média para os mergulhos seleccionados</translation>
     </message>
@@ -14833,15 +9096,6 @@ Files with inappropriate date/time</source>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="72"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
@@ -14850,18 +9104,6 @@ Files with inappropriate date/time</source>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
         <source>h</source>
         <translation>h</translation>
     </message>
@@ -14870,18 +9112,6 @@ Files with inappropriate date/time</source>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -14890,26 +9120,11 @@ Files with inappropriate date/time</source>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
         <source>sec</source>
         <translation>seg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="126"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -14919,25 +9134,16 @@ obtidos a partir do ar usando:
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="128"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="132"/>
         <source>and</source>
         <translation>e</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="134"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
@@ -14947,12 +9153,6 @@ obtidos a partir do ar usando:
     <message>
         <location filename="../desktop-widgets/tableview.ui" line="14"/>
         <location filename="../desktop-widgets/tableview.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tableview.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tableview.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tableview.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tableview.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tableview.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tableview.ui" line="17"/>
         <location filename="../subsurface/desktop-widgets/ui_tableview.h" line="49"/>
         <location filename="../subsurface/desktop-widgets/ui_tableview.h" line="50"/>
         <source>GroupBox</source>
@@ -14960,48 +9160,19 @@ obtidos a partir do ar usando:
     </message>
 </context>
 <context>
-    <name>TagFilter</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="537"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="537"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="582"/>
-        <source>Tags</source>
-        <translation>Categorias</translation>
-    </message>
-</context>
-<context>
-    <name>TagFilterModel</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/filtermodels.cpp" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/filtermodels.cpp" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/filtermodels.cpp" line="359"/>
-        <source>Empty tags</source>
-        <translation>Categorias vazias</translation>
-    </message>
-</context>
-<context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-models/tankinfomodel.cpp" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/tankinfomodel.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/tankinfomodel.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/tankinfomodel.cpp" line="92"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
         <location filename="../qt-models/tankinfomodel.cpp" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/tankinfomodel.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/tankinfomodel.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/tankinfomodel.cpp" line="92"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <location filename="../qt-models/tankinfomodel.cpp" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/tankinfomodel.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/tankinfomodel.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/tankinfomodel.cpp" line="92"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -15010,189 +9181,126 @@ obtidos a partir do ar usando:
     <name>TemplateEdit</name>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="454"/>
         <source>Edit template</source>
         <translation>Editar modelo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="37"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="455"/>
         <source>Preview</source>
         <translation>Prever</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="94"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="473"/>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="104"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="457"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="112"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="458"/>
         <source>Arial</source>
         <translation>Arial</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="117"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="459"/>
         <source>Impact</source>
         <translation>Impact</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="122"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="460"/>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="127"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="461"/>
         <source>Courier</source>
         <translation>Courier</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="132"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="462"/>
         <source>Verdana</source>
         <translation>Verdana</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="144"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="464"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="165"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="465"/>
         <source>Color palette</source>
         <translation>Paleta de cores</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="173"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="466"/>
         <source>Default</source>
         <translation>Padrão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="178"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="178"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="178"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="178"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="467"/>
         <source>Almond</source>
         <translation>Amêndoa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="183"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="468"/>
         <source>Shades of blue</source>
         <translation>Tons de azul</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="188"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="469"/>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="200"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="471"/>
         <source>Line spacing</source>
         <translation>Espaçamento de linhas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="227"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="472"/>
         <source>Border width</source>
         <translation>Espessura do bordo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="271"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="474"/>
         <source>Template</source>
         <translation>Modelo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="294"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="493"/>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="310"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="475"/>
         <source>Background</source>
         <translation>Fundo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="323"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="476"/>
         <source>color1</source>
         <translation>cor1</translation>
@@ -15204,24 +9312,6 @@ obtidos a partir do ar usando:
         <location filename="../desktop-widgets/templateedit.ui" line="453"/>
         <location filename="../desktop-widgets/templateedit.ui" line="493"/>
         <location filename="../desktop-widgets/templateedit.ui" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="453"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="493"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="453"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="493"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="453"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="493"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="533"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="477"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="480"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="483"/>
@@ -15233,99 +9323,66 @@ obtidos a partir do ar usando:
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="350"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="350"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="350"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="350"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="478"/>
         <source>Table cells 1</source>
         <translation>Células da tabela 1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="363"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="479"/>
         <source>color2</source>
         <translation>cor2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="390"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="481"/>
         <source>Table cells 2</source>
         <translation>Células da tabela 2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="403"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="482"/>
         <source>color3</source>
         <translation>cor3</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="430"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="430"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="430"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="430"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="484"/>
         <source>Text 1</source>
         <translation>Texto 1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="443"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="485"/>
         <source>color4</source>
         <translation>cor4</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="470"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="487"/>
         <source>Text 2</source>
         <translation>Texto 2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="483"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="488"/>
         <source>color5</source>
         <translation>cor5</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="510"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="490"/>
         <source>Borders</source>
         <translation>Bordos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="523"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="491"/>
         <source>color6</source>
         <translation>cor6</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.cpp" line="142"/>
         <source>Do you want to save your changes?</source>
         <translation>Deseja gravar as alterações?</translation>
     </message>
@@ -15333,10 +9390,7 @@ obtidos a partir do ar usando:
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="598"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="677"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="677"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="722"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/>
         <source>%1click to visit %2</source>
         <translation>%1clicar para visitar %2</translation>
     </message>
@@ -15361,9 +9415,6 @@ obtidos a partir do ar usando:
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/divetooltipitem.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/divetooltipitem.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/divetooltipitem.cpp" line="137"/>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
@@ -15372,18 +9423,12 @@ obtidos a partir do ar usando:
     <name>URLDialog</name>
     <message>
         <location filename="../desktop-widgets/urldialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/urldialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/urldialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/urldialog.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_urldialog.h" line="57"/>
         <source>Dialog</source>
         <translation>Diálogo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/urldialog.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/urldialog.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/urldialog.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/urldialog.ui" line="52"/>
         <location filename="../subsurface/desktop-widgets/ui_urldialog.h" line="58"/>
         <source>Enter URL for media files</source>
         <translation>Introduzir o URL dos ficheiros multimedia</translation>
@@ -15393,89 +9438,56 @@ obtidos a partir do ar usando:
     <name>UpdateManager</name>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="59"/>
         <source>Check for updates.</source>
         <translation>Procurar actualizações</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="60"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Não foi possível encontrar actualizações para o Subsurface.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="65"/>
         <source>The following error occurred:</source>
         <translation>Ocorreu o seguinte erro :</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="66"/>
         <source>Please check your internet connection.</source>
         <translation>Por favor, verifique a ligação à Internet</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="76"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Está a usar a última versão do Subsurface.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="79"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Está disponível uma nova versão do Subsurface.&lt;br/&gt;Clique em:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; para a transferir.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="85"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Está disponível uma nova versão do Subsurface.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="86"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>A última versão é %1. Por favor verifique %2 a nossa página de downloads %3 para obter informações sobre como actualizar.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="96"/>
         <source>Newest release version is </source>
         <translation>A última versão lançada foi </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="97"/>
         <source>The server returned the following information:</source>
         <translation>O servidor retornou a informação seguinte:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="114"/>
         <source>Subsurface is checking every two weeks if a new version is available. 
 If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>O Subsurface verifica a existência de novas versões a cada duas semanas.
@@ -15483,25 +9495,16 @@ Se não desejar que tal aconteça, por favor clique em Declinar.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="116"/>
         <source>Decline</source>
         <translation>Declinar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="117"/>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Automatic check for updates</source>
         <translation>Verificar automaticamente a existência de actualizações</translation>
     </message>
@@ -15510,21 +9513,12 @@ Se não desejar que tal aconteça, por favor clique em Declinar.</translation>
     <name>UserManual</name>
     <message>
         <location filename="../desktop-widgets/usermanual.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usermanual.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usermanual.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usermanual.cpp" line="76"/>
         <source>User manual</source>
         <translation>Manual do utilizador</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usermanual.cpp" line="75"/>
         <location filename="../desktop-widgets/usermanual.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usermanual.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usermanual.cpp" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usermanual.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usermanual.cpp" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usermanual.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usermanual.cpp" line="110"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Não foi possível encontrar o manual do Subsurface</translation>
     </message>
@@ -15533,143 +9527,95 @@ Se não desejar que tal aconteça, por favor clique em Declinar.</translation>
     <name>UserSurvey</name>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="192"/>
         <source>User survey</source>
         <translation>Questionário ao utilizador</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="168"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="205"/>
         <source>Subsurface user survey</source>
         <translation>Inquérito aos utilizadores do Subsurface</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/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;Gostaríamos de saber mais sobre os utilizadores do nosso programa, as suas preferências e os seus hábitos de utilização. Por faver dispenda alguns momentos a preencher e enviar este formulário para a equipe do Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="47"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="195"/>
         <source>Technical diver</source>
         <translation>Mergulhador técnico</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="54"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="196"/>
         <source>Recreational diver</source>
         <translation>Mergulhador desportivo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="197"/>
         <source>Dive planner</source>
         <translation>Planificação de mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="82"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="199"/>
         <source>Supported dive computer</source>
         <translation>Computador de mergulho suportado</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="89"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="200"/>
         <source>Other software/sources</source>
         <translation>Outras fontes/aplicações</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="96"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="201"/>
         <source>Manually entering dives</source>
         <translation>Preenchimento manual dos mergulhos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="103"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="202"/>
         <source>Android/iPhone companion app</source>
         <translation>Android/iPhone app</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="117"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="203"/>
         <source>Any suggestions? (in English)</source>
         <translation>Algumas sugestões? (em Inglês, por favor)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="127"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="204"/>
         <source>The following information about your system will also be submitted.</source>
         <translation>Será igualmente enviada a seguinte informação sobre o seu sistema.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Que tipo de mergulhador se considera?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>De onde importa os seus dados de mergulho?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="19"/>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="44"/>
         <source>
 Operating system: %1</source>
         <translation>
@@ -15677,9 +9623,6 @@ Sistema operativo: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="46"/>
         <source>
 CPU architecture: %1</source>
         <translation>
@@ -15687,9 +9630,6 @@ Arquitectura do CPU: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="48"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="48"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="48"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="48"/>
         <source>
 OS CPU architecture: %1</source>
         <translation>
@@ -15697,9 +9637,6 @@ Arquitectura do CPU e SO: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="49"/>
         <source>
 Language: %1</source>
         <translation>
@@ -15707,81 +9644,51 @@ Linguagem: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="80"/>
         <source>Should we ask you later?</source>
         <translation>Deveríamos perguntar-lhe mais tarde?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="81"/>
         <source>Don&apos;t ask me again</source>
         <translation>Não me voltem a perguntar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask later</source>
         <translation>Perguntar mais tarde</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="83"/>
         <source>Ask again?</source>
         <translation>Perguntar novamente?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="102"/>
         <source>Submit user survey.</source>
         <translation>Enviar questionário do utilizador.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="103"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Não foi possível enviar o questionário do utilizador.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="108"/>
         <source>The following error occurred:</source>
         <translation>Ocorreu o seguinte erro:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="109"/>
         <source>Please check your internet connection.</source>
         <translation>Por favor, verifique a sua ligação à internet.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="118"/>
         <source>Survey successfully submitted.</source>
         <translation>Questionário enviado.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="123"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Ocorreu um erro na tentativa de procura de actualizações.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -15790,36 +9697,24 @@ Linguagem: %1</translation>
     <name>VideoFrameExtractor</name>
     <message>
         <location filename="../core/videoframeextractor.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/videoframeextractor.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/videoframeextractor.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/videoframeextractor.cpp" line="93"/>
-        <source>ffmpeg failed to start - video thumbnail creation suspended</source>
-        <translation>falha ao executar o ffmpeg - criação das miniaturas vídeo suspensa</translation>
+        <source>ffmpeg failed to start - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
+        <translation>Falha ao arrancar o ffmpeg - criação das miniaturas do vídeo suspensa. Para activar a criação das miniaturas, especificar a localização do executável nas preferências.</translation>
     </message>
     <message>
-        <location filename="../core/videoframeextractor.cpp" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/videoframeextractor.cpp" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/videoframeextractor.cpp" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/videoframeextractor.cpp" line="99"/>
-        <source>failed waiting for ffmpeg - video thumbnail creation suspended</source>
-        <translation>falha durante a espera pela execução do ffmpeg - criação das miniaturas vídeo suspensa</translation>
+        <location filename="../core/videoframeextractor.cpp" line="97"/>
+        <source>Failed waiting for ffmpeg - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
+        <translation>Falha enquanto espera pelo ffmgeg  - a criação das minuaturas vídeo foi suspensa. Para activar a criação das miniaturas, especificar a localização do executável nas preferências.</translation>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-models/weightsysteminfomodel.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/weightsysteminfomodel.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/weightsysteminfomodel.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/weightsysteminfomodel.cpp" line="81"/>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
         <location filename="../qt-models/weightsysteminfomodel.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/weightsysteminfomodel.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/weightsysteminfomodel.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/weightsysteminfomodel.cpp" line="81"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -15828,89 +9723,59 @@ Linguagem: %1</translation>
     <name>WebServices</name>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="129"/>
         <source>Web service connection</source>
         <translation>Ligação ao serviço web</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="25"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="130"/>
         <source>Status:</source>
         <translation>Estado:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="32"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="131"/>
         <source>Enter your ID here</source>
         <translation>Insira a sua ID aqui</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="44"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="132"/>
         <source>Download</source>
         <translation>Transferir</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="68"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="133"/>
         <source>User ID</source>
         <translation>ID do utilizador</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="85"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="135"/>
         <source>Save user ID locally?</source>
         <translation>Gravar o ID do utilizador localmente?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="92"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="136"/>
         <source>Password</source>
         <translation>Palavra-passe</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="106"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="137"/>
         <source>Upload</source>
         <translation>Carregar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="326"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="326"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="331"/>
         <source>Operation timed out</source>
         <translation>A operação demorou demasiado tempo</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="347"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="347"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="352"/>
         <source>Transferring data...</source>
         <translation>A transferir dados...</translation>
     </message>
@@ -15919,25 +9784,16 @@ Linguagem: %1</translation>
     <name>WeightModel</name>
     <message>
         <location filename="../qt-models/weightmodel.cpp" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/weightmodel.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/weightmodel.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/weightmodel.cpp" line="14"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
         <location filename="../qt-models/weightmodel.cpp" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/weightmodel.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/weightmodel.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/weightmodel.cpp" line="14"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-models/weightmodel.cpp" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/weightmodel.cpp" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/weightmodel.cpp" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/weightmodel.cpp" line="78"/>
+        <location filename="../qt-models/weightmodel.cpp" line="71"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Ao clicar aqui irá remover este sistema de lastro</translation>
     </message>
@@ -15945,30 +9801,15 @@ Linguagem: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2198"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2198"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2198"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2198"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2200"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Esta característica não está ainda disponível para o computador de mergulho seleccionado.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2195"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2195"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2195"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2195"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2179"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2189"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2197"/>
         <source>Failed!</source>
         <translation>Falhou!</translation>
     </message>
@@ -15977,25 +9818,16 @@ Linguagem: %1</translation>
     <name>YearStatisticsItem</name>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="63"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="63"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="63"/>
         <source>sec</source>
         <translation>seg</translation>
     </message>
@@ -16004,9 +9836,6 @@ Linguagem: %1</translation>
     <name>YearlyStatisticsModel</name>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="126"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Ano
@@ -16014,17 +9843,11 @@ Linguagem: %1</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="129"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="132"/>
         <source>Duration 
  Total</source>
         <translation>Duração
@@ -16032,9 +9855,6 @@ Total</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="135"/>
         <source>
 Average</source>
         <translation>
@@ -16042,9 +9862,6 @@ Média</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="138"/>
         <source>
 Shortest</source>
         <translation>
@@ -16052,9 +9869,6 @@ Mais curto</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="146"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="141"/>
         <source>
 Longest</source>
         <translation>
@@ -16062,9 +9876,6 @@ Mais longo</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="144"/>
         <source>Depth (%1)
  Average</source>
         <translation>Profundidade (%1)
@@ -16081,15 +9892,6 @@ Fazer média do máximo</translation>
         <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="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="165"/>
         <source>
 Minimum</source>
         <translation>
@@ -16099,15 +9901,6 @@ Mínimo</translation>
         <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="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="168"/>
         <source>
 Maximum</source>
         <translation>
@@ -16115,9 +9908,6 @@ Máximo</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="153"/>
         <source>SAC (%1)
  Average</source>
         <translation>Consumo (%1)
@@ -16125,9 +9915,6 @@ Médio</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="170"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="162"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temperatura (%1)
@@ -16143,10 +9930,7 @@ Média</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="801"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="800"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="800"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="800"/>
+        <location filename="../core/libdivecomputer.c" line="802"/>
         <source>Error parsing the header</source>
         <translation>Erro ao analisar o cabeçalho</translation>
     </message>
@@ -16157,19 +9941,7 @@ Média</translation>
         <location filename="../core/cochran.c" line="306"/>
         <location filename="../core/cochran.c" line="312"/>
         <location filename="../core/cochran.c" line="382"/>
-        <location filename="../core/libdivecomputer.c" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="311"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="311"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="311"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="243"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deco stop</source>
         <translation>paragem de deco</translation>
     </message>
@@ -16177,71 +9949,32 @@ Média</translation>
         <location filename="../core/cochran.c" line="333"/>
         <location filename="../core/cochran.c" line="387"/>
         <location filename="../core/import-csv.c" line="680"/>
-        <location filename="../core/libdivecomputer.c" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="675"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="675"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="675"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="245"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>ascent</source>
         <translation>subida</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="339"/>
         <location filename="../core/import-csv.c" line="658"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="653"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="653"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="653"/>
         <source>battery</source>
         <translation>bateria</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="345"/>
-        <location filename="../core/libdivecomputer.c" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="261"/>
+        <location filename="../core/libdivecomputer.c" line="263"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="350"/>
-        <location filename="../core/libdivecomputer.c" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="349"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="260"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="349"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="260"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="349"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="260"/>
+        <location filename="../core/libdivecomputer.c" line="262"/>
         <source>maxdepth</source>
         <translation>Profundidade máxima</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="355"/>
         <location filename="../core/cochran.c" line="401"/>
-        <location filename="../core/libdivecomputer.c" line="263"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="262"/>
+        <location filename="../core/libdivecomputer.c" line="264"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
@@ -16250,1482 +9983,831 @@ Média</translation>
         <location filename="../core/cochran.c" line="411"/>
         <location filename="../core/cochran.c" line="418"/>
         <location filename="../core/import-csv.c" line="761"/>
-        <location filename="../core/libdivecomputer.c" line="254"/>
-        <location filename="../core/libdivecomputer.c" line="268"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="269"/>
         <location filename="../core/plannernotes.c" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="756"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="756"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="756"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="50"/>
         <source>gaschange</source>
         <translation>troca de gás</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="367"/>
         <location filename="../core/cochran.c" line="406"/>
-        <location filename="../core/libdivecomputer.c" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="366"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="366"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="366"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="244"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="376"/>
         <location filename="../core/cochran.c" line="423"/>
-        <location filename="../core/libdivecomputer.c" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="246"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>ceiling</source>
         <translation>tecto</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="392"/>
-        <location filename="../core/libdivecomputer.c" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="248"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>transmitter</source>
         <translation>transmissor</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="255"/>
+        <location filename="../core/datatrak.c" line="256"/>
         <source>clear</source>
         <translation>limpar</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="258"/>
+        <location filename="../core/datatrak.c" line="259"/>
         <source>misty</source>
         <translation>nebuloso</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="260"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="261"/>
+        <location filename="../core/datatrak.c" line="262"/>
         <source>fog</source>
         <translation>nevoeiro</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="263"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="264"/>
+        <location filename="../core/datatrak.c" line="265"/>
         <source>rain</source>
         <translation>chuva</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="273"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="273"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="267"/>
+        <location filename="../core/datatrak.c" line="268"/>
         <source>storm</source>
         <translation>tempestade</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="269"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="270"/>
+        <location filename="../core/datatrak.c" line="271"/>
         <source>snow</source>
         <translation>neve</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="290"/>
+        <location filename="../core/datatrak.c" line="291"/>
         <source>No suit</source>
         <translation>Sem fato</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="299"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="299"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="293"/>
+        <location filename="../core/datatrak.c" line="294"/>
         <source>Shorty</source>
         <translation>Fato curto</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="296"/>
+        <location filename="../core/datatrak.c" line="297"/>
         <source>Combi</source>
         <translation>Combi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="299"/>
+        <location filename="../core/datatrak.c" line="300"/>
         <source>Wet suit</source>
         <translation>Fato húmido</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="308"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="308"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="302"/>
+        <location filename="../core/datatrak.c" line="303"/>
         <source>Semidry suit</source>
         <translation>Fato semi-seco</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="304"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="311"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="311"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="305"/>
+        <location filename="../core/datatrak.c" line="306"/>
         <source>Dry suit</source>
         <translation>Fato seco</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="365"/>
+        <location filename="../core/datatrak.c" line="365"/>
         <source>no stop</source>
         <translation>sem paragens</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="365"/>
-        <location filename="../core/dive.c" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="31"/>
+        <location filename="../core/datatrak.c" line="367"/>
+        <location filename="../core/tag.c" line="20"/>
         <source>deco</source>
         <translation>descompressão</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="369"/>
+        <location filename="../core/datatrak.c" line="369"/>
         <source>single ascent</source>
         <translation>subida única</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="371"/>
+        <location filename="../core/datatrak.c" line="371"/>
         <source>multiple ascent</source>
         <translation>multiplas subidas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="29"/>
+        <location filename="../core/tag.c" line="18"/>
         <source>fresh</source>
         <translation>água doce</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="373"/>
+        <location filename="../core/datatrak.c" line="373"/>
         <source>fresh water</source>
         <translation>água doce</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="375"/>
+        <location filename="../core/datatrak.c" line="375"/>
         <source>salt water</source>
         <translation>água salgada</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="394"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="400"/>
+        <location filename="../core/datatrak.c" line="396"/>
         <source>sight seeing</source>
         <translation>&quot;ver as vistas&quot;</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="402"/>
+        <location filename="../core/datatrak.c" line="398"/>
         <source>club dive</source>
         <translation>mergulho de clube</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="30"/>
+        <location filename="../core/datatrak.c" line="400"/>
+        <location filename="../core/tag.c" line="19"/>
         <source>instructor</source>
         <translation>instrutor</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="406"/>
+        <location filename="../core/datatrak.c" line="402"/>
         <source>instruction</source>
         <translation>instrução</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <location filename="../core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="29"/>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/tag.c" line="18"/>
         <source>night</source>
         <translation>nocturno</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="416"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="416"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="27"/>
+        <location filename="../core/datatrak.c" line="406"/>
+        <location filename="../core/tag.c" line="16"/>
         <source>cave</source>
         <translation>gruta</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="26"/>
+        <location filename="../core/datatrak.c" line="408"/>
+        <location filename="../core/tag.c" line="15"/>
         <source>ice</source>
         <translation>gelo</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="420"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="420"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="414"/>
+        <location filename="../core/datatrak.c" line="410"/>
         <source>search</source>
         <translation>busca</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="415"/>
-        <location filename="../core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="429"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="429"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="27"/>
+        <location filename="../core/datatrak.c" line="417"/>
+        <location filename="../core/tag.c" line="16"/>
         <source>wreck</source>
         <translation>naufrágio</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="417"/>
-        <location filename="../core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="431"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="431"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="425"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="28"/>
+        <location filename="../core/datatrak.c" line="419"/>
+        <location filename="../core/tag.c" line="17"/>
         <source>river</source>
         <translation>rio</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="419"/>
-        <location filename="../core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="427"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="25"/>
+        <location filename="../core/datatrak.c" line="421"/>
+        <location filename="../core/tag.c" line="14"/>
         <source>drift</source>
         <translation>à deriva</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="421"/>
-        <location filename="../core/dive.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="435"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="435"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="429"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="30"/>
+        <location filename="../core/datatrak.c" line="423"/>
+        <location filename="../core/tag.c" line="19"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="437"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="437"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="431"/>
+        <location filename="../core/datatrak.c" line="425"/>
         <source>other</source>
         <translation>outro</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="448"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="448"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="442"/>
+        <location filename="../core/datatrak.c" line="435"/>
         <source>Other activities</source>
         <translation>Outras actividades</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="472"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="472"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="466"/>
+        <location filename="../core/datatrak.c" line="459"/>
         <source>Datatrak/Wlog notes</source>
         <translation>Notas Datatrak/Wlog</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="510"/>
+        <location filename="../core/datatrak.c" line="503"/>
         <source>[Warning] Manual dive # %d
 </source>
         <translation>[Aviso] Mergulho inserido manualmente # %d
 </translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="536"/>
+        <location filename="../core/datatrak.c" line="529"/>
         <source>[Error] Out of memory for dive %d. Abort parsing.</source>
         <translation>[Erro] Falta de memória para o mergulho %d. A cancelar análise.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="575"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="589"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="589"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="583"/>
+        <location filename="../core/datatrak.c" line="577"/>
         <source>[Error] File is not a DataTrak file. Aborted</source>
         <translation>[Erro] O ficheiro não é do tipo Datatrak. Cancelado</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="602"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="602"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="596"/>
+        <location filename="../core/datatrak.c" line="590"/>
         <source>Error: no dive</source>
         <translation>Erro: sem mergulho</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="25"/>
+        <location filename="../core/tag.c" line="14"/>
         <source>boat</source>
         <translation>barco</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="25"/>
+        <location filename="../core/tag.c" line="14"/>
         <source>shore</source>
         <translation>costa</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="26"/>
+        <location filename="../core/tag.c" line="15"/>
         <source>deep</source>
         <translation>profundo</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="26"/>
+        <location filename="../core/tag.c" line="15"/>
         <source>cavern</source>
         <translation>caverna</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="27"/>
+        <location filename="../core/tag.c" line="16"/>
         <source>altitude</source>
         <translation>em altitude</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="28"/>
+        <location filename="../core/tag.c" line="17"/>
         <source>pool</source>
         <translation>piscina</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="28"/>
+        <location filename="../core/tag.c" line="17"/>
         <source>lake</source>
         <translation>lago</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="29"/>
+        <location filename="../core/tag.c" line="18"/>
         <source>student</source>
         <translation>aluno</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="30"/>
+        <location filename="../core/tag.c" line="19"/>
         <source>video</source>
         <translation>vídeo</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="35"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>OC-gas</source>
         <translation>gás-circuito aberto</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="35"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>diluent</source>
         <translation>diluente</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="36"/>
-        <location filename="../core/equipment.c" line="90"/>
-        <location filename="../core/planner.c" line="1158"/>
-        <location filename="../core/planner.c" line="1161"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="1145"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="1148"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="1145"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="1148"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="1145"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="1148"/>
+        <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"/>
         <source>oxygen</source>
         <translation>oxigénio</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="35"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>not used</source>
         <translation>não usado</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="40"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>Open circuit</source>
         <translation>Circuito aberto</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="293"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="293"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="293"/>
+        <location filename="../core/units.c" line="14"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="299"/>
         <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="620"/>
-        <location filename="../core/qthelper.cpp" line="812"/>
-        <location filename="../core/qthelper.cpp" line="1250"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="622"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1272"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="622"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1268"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="622"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1268"/>
+        <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/dive.c" line="303"/>
-        <location filename="../core/qthelper.cpp" line="623"/>
-        <location filename="../core/qthelper.cpp" line="814"/>
-        <location filename="../core/qthelper.cpp" line="1249"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="625"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="816"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1271"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="625"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="816"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1267"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="625"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="816"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1267"/>
+        <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/dive.c" line="340"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="339"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="339"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="339"/>
+        <location filename="../core/units.c" line="60"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="345"/>
-        <location filename="../core/qthelper.cpp" line="1273"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1295"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1291"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1291"/>
+        <location filename="../core/qthelper.cpp" line="1277"/>
+        <location filename="../core/units.c" line="65"/>
         <source>cuft</source>
         <translation>pés cúbicos</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="386"/>
-        <location filename="../core/qthelper.cpp" line="536"/>
-        <location filename="../core/qthelper.cpp" line="551"/>
-        <location filename="../core/qthelper.cpp" line="730"/>
-        <location filename="../core/qthelper.cpp" line="1225"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="538"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="732"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1247"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="538"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="732"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1243"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="538"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="732"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1243"/>
+        <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/dive.c" line="391"/>
-        <location filename="../core/qthelper.cpp" line="539"/>
-        <location filename="../core/qthelper.cpp" line="553"/>
-        <location filename="../core/qthelper.cpp" line="732"/>
-        <location filename="../core/qthelper.cpp" line="1224"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="555"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1246"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="555"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1242"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="555"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1242"/>
+        <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>pés</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="413"/>
+        <location filename="../core/units.c" line="134"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="416"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="415"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="415"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="415"/>
+        <location filename="../core/units.c" line="136"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="421"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="420"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="420"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="420"/>
+        <location filename="../core/units.c" line="141"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="422"/>
+        <location filename="../core/units.c" line="143"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="442"/>
-        <location filename="../core/qthelper.cpp" line="562"/>
-        <location filename="../core/qthelper.cpp" line="572"/>
-        <location filename="../core/qthelper.cpp" line="787"/>
-        <location filename="../core/qthelper.cpp" line="1201"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1223"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1219"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1219"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="135"/>
+        <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>libras</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="446"/>
-        <location filename="../core/qthelper.cpp" line="560"/>
-        <location filename="../core/qthelper.cpp" line="570"/>
-        <location filename="../core/qthelper.cpp" line="785"/>
-        <location filename="../core/qthelper.cpp" line="1200"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="562"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="572"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="787"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1222"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="562"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="572"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="787"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1218"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="562"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="572"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="787"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1218"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="133"/>
+        <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="677"/>
-        <location filename="../core/equipment.c" line="86"/>
-        <location filename="../core/planner.c" line="1154"/>
-        <location filename="../core/planner.c" line="1157"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelist.c" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="1141"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="1144"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelist.c" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="1141"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="1144"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelist.c" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="1141"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="1144"/>
+        <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>ar</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="88"/>
+        <location filename="../core/equipment.c" line="142"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="175"/>
+        <location filename="../core/equipment.c" line="252"/>
         <source>integrated</source>
         <translation>integrado</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="176"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="176"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="176"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="176"/>
+        <location filename="../core/equipment.c" line="253"/>
         <source>belt</source>
         <translation>cinto</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="177"/>
+        <location filename="../core/equipment.c" line="254"/>
         <source>ankle</source>
         <translation>tornozelo</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="178"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="178"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="178"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="178"/>
+        <location filename="../core/equipment.c" line="255"/>
         <source>backplate</source>
         <translation>backplate</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="179"/>
+        <location filename="../core/equipment.c" line="256"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/file.c" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/file.c" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/file.c" line="115"/>
+        <location filename="../core/file.c" line="117"/>
         <source>No dives in the input file &apos;%s&apos;</source>
         <translation>Não existem mergulhos no ficheiro &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="334"/>
+        <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="53"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/file.c" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="353"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="494"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="832"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/ostctools.c" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/file.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="353"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="494"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="832"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/ostctools.c" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/file.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="353"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="494"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="832"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/ostctools.c" line="50"/>
+        <location filename="../core/ostctools.c" line="54"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Falha na leitura de &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/file.c" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/file.c" line="219"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/file.c" line="219"/>
+        <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>Não foi possível abrir o ficheiro CSV %s; por favor usar a opção Importar log no menu Ficheiro</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/file.c" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/file.c" line="334"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/file.c" line="334"/>
+        <location filename="../core/file.c" line="337"/>
         <source>Empty file &apos;%s&apos;</source>
         <translation>Ficheiro vazio &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="597"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="592"/>
         <source>Poseidon import failed: unable to read &apos;%s&apos;</source>
         <translation>Falha ao importar Poseidon: não foi possíve ler &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="633"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="628"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="628"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="628"/>
         <source>Mouth piece position OC</source>
         <translation>Posição do bocal circuito aberto</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="637"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="632"/>
         <source>Mouth piece position CC</source>
         <translation>Posição do bocal circuito fechado</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="641"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="636"/>
         <source>Mouth piece position unknown</source>
         <translation>Posição do bocal desconhecida</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="645"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="640"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="640"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="640"/>
         <source>Mouth piece position not connected</source>
         <translation>Posição do bocal não ligada</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="652"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="647"/>
         <source>Power off</source>
         <translation>Desligado</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="702"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="697"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="697"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="697"/>
         <source>O₂ calibration failed</source>
         <translation>A calibração de O₂ falhou</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="704"/>
         <location filename="../core/import-csv.c" line="713"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="708"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="708"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="708"/>
         <source>O₂ calibration</source>
         <translation>Calibração de O₂ </translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="227"/>
         <source>No dive profile found from &apos;%s&apos;</source>
         <translation>Não foi encontrado um perfil de mergulho em &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="82"/>
+        <location filename="../core/git-access.c" line="85"/>
         <source>Checkout from storage (%lu/%lu)</source>
         <translation>Descarregar do armazenamento (%lu/%lu)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="113"/>
+        <location filename="../core/git-access.c" line="116"/>
         <source>Transfer from storage (%d/%d)</source>
         <translation>Transferir do armazenamento (%d/%d)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="125"/>
+        <location filename="../core/git-access.c" line="128"/>
         <source>Transfer to storage (%d/%d)</source>
         <translation>Transferir para o armazenamento (%d/%d)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="161"/>
+        <location filename="../core/git-access.c" line="164"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation>A cache da pasta %s está corrompida - não é possível sincronizar com o armazenamento remoto do Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="185"/>
-        <location filename="../core/git-access.c" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="204"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="204"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="204"/>
+        <location filename="../core/git-access.c" line="187"/>
+        <location filename="../core/git-access.c" line="207"/>
         <source>Could not update local cache to newer remote data</source>
         <translation>Não foi possível actualizar a cache local com os novos dados no servidor remoto</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="198"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="197"/>
+        <location filename="../core/git-access.c" line="200"/>
         <source>Subsurface cloud storage corrupted</source>
         <translation>O armazenamento remoto do Subsurface está corrompido</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="334"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="333"/>
+        <location filename="../core/git-access.c" line="336"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
         <translation>Não foi possível actualizar o armazenamento remoto do Subsurface. Tente novamente mais tarde</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="394"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="393"/>
+        <location filename="../core/git-access.c" line="396"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
         <translation>O dados remotos divergem dos dados locais. Erro: falha na junção (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="424"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="423"/>
+        <location filename="../core/git-access.c" line="426"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
         <translation>Os dados no servidor remoto divergem dos dados locais. Não é possível combinar as diferenças.</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="458"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="457"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="457"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="457"/>
+        <location filename="../core/git-access.c" line="460"/>
         <source>Remote storage and local data diverged</source>
         <translation>Os dados no servidor remoto divergem dos dados locais.</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="461"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="460"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="460"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="460"/>
+        <location filename="../core/git-access.c" line="463"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
         <translation>Os dados no servidor remoto divergem dos dados locais. Erro: a escrita dos dados falhou (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="469"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="469"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="469"/>
+        <location filename="../core/git-access.c" line="472"/>
         <source>Problems with local cache of Subsurface cloud data</source>
         <translation>Problemas com a cache local dos dados remotos do Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="471"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="470"/>
+        <location filename="../core/git-access.c" line="473"/>
         <source>Moved cache data to %s. Please try the operation again.</source>
         <translation>Cache movida para %s. Tente novamente a operação.</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="517"/>
+        <location filename="../core/git-access.c" line="520"/>
         <source>Update local storage to match cloud storage</source>
         <translation>A actualizar o armazenamento local de acordo com o armazenamento remoto</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="526"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="525"/>
+        <location filename="../core/git-access.c" line="528"/>
         <source>Push local changes to cloud storage</source>
         <translation>Transferir alterações locais para o armazenamento remoto</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="544"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="543"/>
+        <location filename="../core/git-access.c" line="546"/>
         <source>Try to merge local changes into cloud storage</source>
         <translation>Tentar fundir as alterações locais para o armazenamento remoto</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="585"/>
+        <location filename="../core/git-access.c" line="588"/>
         <source>Store data into cloud storage</source>
         <translation>Armazenar dados remotamente</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="610"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="609"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="609"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="609"/>
+        <location filename="../core/git-access.c" line="612"/>
         <source>Sync with cloud storage</source>
         <translation>Sincronizar com o armazenamento remoto</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="637"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="636"/>
+        <location filename="../core/git-access.c" line="639"/>
         <source>Can&apos;t reach cloud server, working with local data</source>
         <translation>Não foi possível ligar ao servidor remoto, usando os dados armazenados localmente</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="650"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="649"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="649"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="649"/>
+        <location filename="../core/git-access.c" line="652"/>
         <source>Successful cloud connection, fetch remote</source>
         <translation>Ligação remota bem sucedida, a descarregar dados</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="669"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="668"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="668"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="668"/>
+        <location filename="../core/git-access.c" line="671"/>
         <source>Done syncing with cloud storage</source>
         <translation>Sincronização com o armazenamento remoto concluída</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="804"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="803"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="803"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="803"/>
+        <location filename="../core/git-access.c" line="806"/>
         <source>Error connecting to Subsurface cloud storage</source>
         <translation>Erro ao ligar ao armazenamento remodo do Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="807"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="806"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="806"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="806"/>
+        <location filename="../core/git-access.c" line="809"/>
         <source>git clone of %s failed (%s)</source>
         <translation>Falha (%s) no git clone %s </translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="833"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="832"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="832"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="832"/>
+        <location filename="../core/git-access.c" line="835"/>
         <source>Synchronising data file</source>
         <translation>A sincronizar o ficheiro de dados</translation>
     </message>
     <message>
-        <location filename="../core/import-divinglog.c" line="315"/>
-        <location filename="../core/libdivecomputer.c" line="230"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/>
-        <location filename="../core/uemis-downloader.c" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-divinglog.c" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurface-qt/DiveObjectHelper.cpp" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-divinglog.c" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurface-qt/DiveObjectHelper.cpp" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-divinglog.c" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurface-qt/DiveObjectHelper.cpp" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="194"/>
+        <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/uemis-downloader.c" line="199"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="242"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>none</source>
         <translation>nenhum</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="247"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>workload</source>
         <translation>esforço</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="249"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>violation</source>
         <translation>transgressão</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="251"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="250"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>bookmark</source>
         <translation>marcador</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="251"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="251"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="251"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>surface</source>
         <translation>superfície</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="252"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>safety stop</source>
         <translation>paragem de segurança</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="254"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>safety stop (voluntary)</source>
         <translation>paragem de segurança (voluntária)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="257"/>
         <source>safety stop (mandatory)</source>
         <translation>paragem de segurança (obrigatória)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="256"/>
+        <location filename="../core/libdivecomputer.c" line="258"/>
         <source>deepstop</source>
         <translation>paragem funda</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="258"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="257"/>
+        <location filename="../core/libdivecomputer.c" line="259"/>
         <source>ceiling (safety stop)</source>
         <translation>tecto (paragem de segurança)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="258"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="258"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="258"/>
+        <location filename="../core/libdivecomputer.c" line="260"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>abaixo da zona de descompressão</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="260"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="259"/>
+        <location filename="../core/libdivecomputer.c" line="261"/>
         <source>divetime</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="263"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="263"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="263"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>airtime</source>
         <translation>autonomia</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="264"/>
+        <location filename="../core/libdivecomputer.c" line="266"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="265"/>
+        <location filename="../core/libdivecomputer.c" line="267"/>
         <source>heading</source>
         <translation>cabeçalho</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="266"/>
+        <location filename="../core/libdivecomputer.c" line="268"/>
         <source>tissue level warning</source>
         <translation>Alarme de tensão de azoto nos tecidos</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="277"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="276"/>
+        <location filename="../core/libdivecomputer.c" line="278"/>
         <source>invalid event number</source>
         <translation>Número de evento inválido</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="613"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="612"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="612"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="612"/>
+        <location filename="../core/libdivecomputer.c" line="614"/>
         <source>Error parsing the datetime</source>
         <translation>Erro na análise da data/tempo</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="631"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="630"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="630"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="630"/>
+        <location filename="../core/libdivecomputer.c" line="632"/>
         <source>Dive %d: %s</source>
         <translation>Mergulho nº %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="637"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="636"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error parsing the divetime</source>
         <translation>Erro na análise do tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="646"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="646"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="646"/>
+        <location filename="../core/libdivecomputer.c" line="648"/>
         <source>Error parsing the maxdepth</source>
         <translation>Erro na análise da profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="661"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="660"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="660"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="660"/>
+        <location filename="../core/libdivecomputer.c" line="662"/>
         <source>Error parsing temperature</source>
         <translation>Erro ao analisar tempetaturas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="680"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="679"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="679"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="679"/>
+        <location filename="../core/libdivecomputer.c" line="681"/>
         <source>Error parsing the gas mix count</source>
         <translation>Erro na análise na contagem da mistura de gás</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="691"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="690"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="690"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="690"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="700"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="699"/>
+        <location filename="../core/libdivecomputer.c" line="701"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erro na obtenção da pressão atmosférica</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="722"/>
+        <location filename="../core/libdivecomputer.c" line="724"/>
         <source>Error obtaining dive mode</source>
         <translation>Erro ao obter o modo de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="745"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="744"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="744"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="744"/>
+        <location filename="../core/libdivecomputer.c" line="746"/>
         <source>Error parsing the gas mix</source>
         <translation>Erro na análise da mistura de gás</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="771"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="770"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="770"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="770"/>
+        <location filename="../core/libdivecomputer.c" line="772"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Não é possivel criar o &quot;parser&quot; para %s %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="777"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="776"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="776"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="776"/>
+        <location filename="../core/libdivecomputer.c" line="778"/>
         <source>Error registering the data</source>
         <translation>Erro no registo de dados</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="808"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="807"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="807"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="807"/>
+        <location filename="../core/libdivecomputer.c" line="809"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="815"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="814"/>
+        <location filename="../core/libdivecomputer.c" line="816"/>
         <source>Already downloaded dive at %s</source>
         <translation>Mergulho já descarregado em %s</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1057"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1063"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1063"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1063"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: à espera de acção do utilizador</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1079"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1082"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1085"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1085"/>
         <source>model=%s firmware=%u serial=%u</source>
         <translation>modelo=%s firmware=%u numserie=%u</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1145"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1148"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1151"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1151"/>
         <source>Error registering the event handler.</source>
         <translation>Erro no registo do &quot;event handler&quot;.</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1150"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1153"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1156"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1156"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erro no registo do &quot;cancellation handler&quot;.</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1171"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1174"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1177"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1177"/>
         <source>Dive data import error</source>
         <translation>Erro a importar os dados do mergulho</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1358"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1361"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1364"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1364"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto do libdivecomputer</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1367"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1370"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1373"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1373"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Não se consegue abrir  %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1378"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1381"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1384"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1384"/>
         <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>Erro ao abrir o dispositivo %s %s (%s).
@@ -17733,9 +10815,6 @@ Na maioria dos casos, de modo a despistar o problema, é útil enviar os registo
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1380"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1383"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1386"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1386"/>
         <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>
@@ -17745,81 +10824,48 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1388"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1391"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1394"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1394"/>
         <source>No new dives downloaded from dive computer</source>
         <translation>Não foram descarregados novos mergulhos do computador de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="174"/>
-        <location filename="../core/parse-xml.c" line="1206"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/load-git.c" line="169"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/parse-xml.c" line="1205"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/load-git.c" line="169"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/parse-xml.c" line="1205"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/load-git.c" line="169"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/parse-xml.c" line="1205"/>
+        <location filename="../core/load-git.c" line="186"/>
+        <location filename="../core/parse-xml.c" line="1208"/>
         <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation>várias posições GPS para este local; ver também %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="200"/>
-        <location filename="../core/parse.c" line="447"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/load-git.c" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/parse.c" line="446"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/load-git.c" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/parse.c" line="447"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/load-git.c" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/parse.c" line="447"/>
+        <location filename="../core/load-git.c" line="211"/>
+        <location filename="../core/parse.c" line="443"/>
         <source>additional name for site: %s
 </source>
         <translation>nome adicional para o local: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1663"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/load-git.c" line="1668"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/load-git.c" line="1668"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/load-git.c" line="1668"/>
+        <location filename="../core/load-git.c" line="1659"/>
         <source>Load dives from local cache</source>
         <translation>Carregar dados do armazenamento local</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1667"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/load-git.c" line="1672"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/load-git.c" line="1672"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/load-git.c" line="1672"/>
+        <location filename="../core/load-git.c" line="1663"/>
         <source>Successfully opened dive data</source>
         <translation>Dados de mergulho abertos com sucesso</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="128"/>
-        <location filename="../core/ostctools.c" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/ostctools.c" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/ostctools.c" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/ostctools.c" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/ostctools.c" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/ostctools.c" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/ostctools.c" line="156"/>
+        <location filename="../core/ostctools.c" line="129"/>
+        <location filename="../core/ostctools.c" line="160"/>
         <source>Unknown DC in dive %d</source>
         <translation>Computador de mergulho desconhecido no mergulho %d</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="171"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/ostctools.c" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/ostctools.c" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/ostctools.c" line="168"/>
+        <location filename="../core/ostctools.c" line="172"/>
         <source>Error - %s - parsing dive %d</source>
         <translation>Erro - %s - ao analisar o mergulho %d</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/parse-xml.c" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/parse-xml.c" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/parse-xml.c" line="399"/>
+        <location filename="../core/parse-xml.c" line="401"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Leitura estranha das percentagens %s
@@ -17827,32 +10873,16 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo
     </message>
     <message>
         <location filename="../core/parse-xml.c" line="1663"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/parse-xml.c" line="1661"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/parse-xml.c" line="1661"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/parse-xml.c" line="1661"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Falha na análise de &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../core/parse-xml.c" line="2256"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/parse-xml.c" line="2251"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/parse-xml.c" line="2251"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/parse-xml.c" line="2251"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Não é possível abrir a folha de estilos %s</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="115"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>AVISO: ESTA É UMA NOVA IMPLEMENTAÇÃO DO ALGORITMO %s E UMA NOVA IMPLEMENTAÇÃO DE UM PLANEADOR NELE BASEADO. APESAR DE TER SIDO ALVO DE ALGUNS TESTES, ESTES NÃO FORAM EXAUSTIVOS. RECOMENDA-SE VIVAMENTE QUE NÃO PLANEIE MERGULHOS APENAS COM BASE NOS RESULTADOS AQUI APRESENTADOR.</translation>
-    </message>
-    <message>
         <location filename="../core/plannernotes.c" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="109"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>O cálculo da descompressão foi terminado por esta ser demasiado longa</translation>
     </message>
@@ -17864,247 +10894,139 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo
         <location filename="../core/plannernotes.c" line="551"/>
         <location filename="../core/plannernotes.c" line="585"/>
         <location filename="../core/plannernotes.c" line="596"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="464"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="509"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="576"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="587"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="464"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="509"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="576"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="587"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="464"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="509"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="576"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="587"/>
         <source>Warning:</source>
         <translation>Aviso:</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="416"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="409"/>
         <source>, effective GF=%d/%d</source>
         <translation>, GF=%d/%d efectivo</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="306"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="204"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="204"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="205"/>
+        <location filename="../core/planner.c" line="300"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="194"/>
         <source>SP change</source>
         <translation>Mudança de SP</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="98"/>
         <source>VPM-B</source>
         <translation>VPM-B</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="100"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="100"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="100"/>
         <source>BUHLMANN</source>
         <translation>BUHLMANN</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="152"/>
         <source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
         <translation>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="160"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="156"/>
         <source>depth</source>
         <translation>profundidade</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="158"/>
         <source>duration</source>
         <translation>duração</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="53"/>
         <location filename="../core/plannernotes.c" line="164"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="160"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="160"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="160"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="166"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="162"/>
         <source>gas</source>
         <translation>gás</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="48"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="48"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="48"/>
         <source>Isobaric counterdiffusion information</source>
         <translation>Informação sobre contra-difusão isobárica</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="51"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="51"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="51"/>
         <source>&amp;#916;He</source>
         <translation>&amp;#916;He</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="52"/>
         <source>&amp;#916;N&amp;#8322;</source>
         <translation>&amp;#916;N&amp;#8322;</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="53"/>
         <source>max &amp;#916;N&amp;#8322;</source>
         <translation>max &amp;#916;N&amp;#8322;</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="297"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="290"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="290"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="290"/>
         <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"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="299"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="299"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="299"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="372"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="365"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Trocar gás para %s (SP = %.1fbar)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="367"/>
         <source>Switch gas to %s</source>
         <translation>Mudar para %s</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="396"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="397"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="397"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="397"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="405"/>
         <source>Deco model: VPM-B at nominal conservatism</source>
         <translation>Modelo de descompressão: VPM-B com conservadorismo nominal</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="505"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="496"/>
         <source>Minimum gas</source>
         <translation>Reserva</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="497"/>
         <source>based on</source>
         <translation>baseado em</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="508"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="499"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="499"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="499"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="518"/>
         <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 de &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="532"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="523"/>
         <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 de &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s durante a subida planeada)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="526"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="526"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="526"/>
         <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 de &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</translation>
     </message>
@@ -18112,39 +11034,21 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo
         <location filename="../core/plannernotes.c" line="128"/>
         <location filename="../core/plannernotes.c" line="135"/>
         <location filename="../core/plannernotes.c" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="139"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="141"/>
         <source>dive plan&lt;/b&gt; (surface interval </source>
         <translation>plano de mergulho&lt;/b&gt; (intervalo de superfície</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="143"/>
         <source>created on</source>
         <translation>criado a</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="133"/>
         <source>dive plan&lt;/b&gt; created on</source>
         <translation>plano de mergulho&lt;/b&gt; criado a</translation>
     </message>
@@ -18155,213 +11059,129 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="126"/>
         <source>dive plan&lt;/b&gt; (overlapping dives detected)</source>
         <translation>plano de mergulho &lt;/b&gt; (foram detectados mergulhos sobrepostos)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="149"/>
         <source>Runtime: %dmin%s</source>
         <translation>Runtime: %dmin%s</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="213"/>
         <source>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>%s para %.*f %s em %d:%02d min - runtime %d:%02u em %s (SP = %.1fbar)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="221"/>
         <location filename="../core/plannernotes.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="222"/>
         <source>Ascend</source>
         <translation>Subida</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="221"/>
         <location filename="../core/plannernotes.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="222"/>
         <source>Descend</source>
         <translation>Descida</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="221"/>
         <source>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>%s para %.*f %s em %d:%02d min - runtime %d:%02u em %s</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="236"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="236"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="236"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar CCR)</source>
         <translation>Permaneça a %.*f %s durante %d:%02d min - runtime %d:%02u em %s (SP = %.1fbar CCR)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="243"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s %s</source>
         <translation>Permaneça em %.*f %s durante %d:%02d min - runtime %d:%02u em %s %s</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="316"/>
         <location filename="../core/plannernotes.c" line="339"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="309"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="309"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="309"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="332"/>
         <source>(SP = %.1fbar CCR)</source>
         <translation>(SP = %.1fbar CCR)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="402"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="402"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="402"/>
         <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source>
         <translation>Modelo Deco: Bühlmann ZHL-16C com GFLow = %d%% e GFHigh = %d%%</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="407"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="407"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="407"/>
         <source>Deco model: VPM-B at +%d conservatism</source>
         <translation>Modelo de descompressão: VPM-B com conservadorismo de +%d</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="411"/>
         <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source>
         <translation>Modelo Deco: Modelo recreativo baseado em Bühlmann ZHL-16B com GFLow = %d%% e GFHigh = %d%%</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="426"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="419"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="419"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="419"/>
         <source>ATM pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</source>
         <translation>Pressão atmosférica: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="434"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Consumo de gás (excluídas as fases c/CCR):</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="436"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="436"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="436"/>
         <source>Gas consumption (based on SAC</source>
         <translation>Consumo de gás (baseado numa taxa</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="474"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="465"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="465"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="465"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>a quantidade de gás necessária excede a quantidade disponível na garrafa!</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="480"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="471"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="471"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="471"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>a reserva de gás não é suficiente para ser partilhada durante a subida!</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="510"/>
         <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source>
         <translation>a quantidade mínima de gás necessária para a subida já excede a pressão inicial da garrafa!</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="524"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="515"/>
         <source>%.0f%s/%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s/%.0f%s na subida planeada)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="543"/>
         <source>Isobaric counterdiffusion conditions exceeded</source>
         <translation>Condições de contra-difusão isobárica excedidas</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="574"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valor pO₂ elevado %.2f em %d:%02u com gás %s à profundidade de %.*f %s</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="594"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="585"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valor de pO₂ baixo %.2f em %d:%02u com gás %s à profundidade de %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="881"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="877"/>
+        <location filename="../core/planner.c" line="900"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Não foi possível encontrar o gás %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1162"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="1149"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="1149"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="1149"/>
+        <location filename="../core/planner.c" line="1183"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1397"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1406"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -18370,139 +11190,91 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1408"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1404"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1404"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1402"/>
+        <location filename="../core/profile.c" line="1417"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1414"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1410"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1410"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1408"/>
+        <location filename="../core/profile.c" line="1423"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1417"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1413"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1413"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1411"/>
+        <location filename="../core/profile.c" line="1426"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1419"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1415"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1415"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1413"/>
+        <location filename="../core/profile.c" line="1428"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1417"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1417"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1415"/>
-        <source>pO%s: %.2fbar
-</source>
-        <translation>pO%s: %.2fbar
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1419"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1419"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1417"/>
-        <source>pN%s: %.2fbar
-</source>
-        <translation>pN%s: %.2fbar
-</translation>
-    </message>
-    <message>
-        <location filename="../core/profile.c" line="1428"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1421"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1421"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1419"/>
+        <location filename="../core/profile.c" line="1437"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1431"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1424"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1424"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1422"/>
+        <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="1471"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1464"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1464"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1462"/>
+        <location filename="../core/profile.c" line="1480"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Descompressão: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1463"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1456"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1456"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1454"/>
+        <location filename="../core/profile.c" line="1472"/>
         <source>Safety stop: %umin @ %.0f%s
 </source>
         <translation>Paragem de segurança: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1404"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1400"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1400"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1398"/>
+        <location filename="../core/profile.c" line="1413"/>
         <source>P: %d%s (%s)
 </source>
         <translation>P: %d%s (%s)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1421"/>
+        <location filename="../core/profile.c" line="1430"/>
         <source>pO₂: %.2fbar
 </source>
         <translation>pO₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1423"/>
+        <location filename="../core/profile.c" line="1432"/>
         <source>SCR ΔpO₂: %.2fbar
 </source>
         <translation>SCR ΔpO₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1426"/>
+        <location filename="../core/profile.c" line="1435"/>
         <source>pN₂: %.2fbar
 </source>
         <translation>pN₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1440"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1433"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1433"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1431"/>
+        <location filename="../core/profile.c" line="1449"/>
         <source>EAD: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -18511,10 +11283,7 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1446"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1439"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1439"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1437"/>
+        <location filename="../core/profile.c" line="1455"/>
         <source>END: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -18523,935 +11292,567 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1451"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1444"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1444"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1442"/>
+        <location filename="../core/profile.c" line="1460"/>
         <source>Density: %.1fg/ℓ
 </source>
         <translation>Densidade: %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1466"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1459"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1459"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1457"/>
+        <location filename="../core/profile.c" line="1475"/>
         <source>Safety stop: unknown time @ %.0f%s
 </source>
         <translation>Paragem de segurança: duração desconhecida @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1474"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1467"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1467"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1465"/>
+        <location filename="../core/profile.c" line="1483"/>
         <source>Deco: unknown time @ %.0f%s
 </source>
         <translation>Descompressão: duração desconhecida @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1478"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1471"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1471"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1469"/>
+        <location filename="../core/profile.c" line="1487"/>
         <source>In deco
 </source>
         <translation>Em descompressão
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1480"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1473"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1473"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1471"/>
+        <location filename="../core/profile.c" line="1489"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1483"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1476"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1476"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1474"/>
+        <location filename="../core/profile.c" line="1492"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1486"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1479"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1479"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1477"/>
+        <location filename="../core/profile.c" line="1495"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Descompressão:  %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1494"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1487"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1487"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1485"/>
+        <location filename="../core/profile.c" line="1503"/>
         <source>In deco (calc)
 </source>
         <translation>Em descompressão (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1497"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1490"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1490"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1488"/>
+        <location filename="../core/profile.c" line="1506"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1492"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1492"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1490"/>
+        <location filename="../core/profile.c" line="1508"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1503"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1496"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1496"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1494"/>
+        <location filename="../core/profile.c" line="1512"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1505"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1498"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1498"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1496"/>
+        <location filename="../core/profile.c" line="1514"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1508"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1501"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1501"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1499"/>
+        <location filename="../core/profile.c" line="1517"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1520"/>
         <source>Surface GF %.0f%%
 </source>
         <translation>GF à superfície %.0f%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1514"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1504"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1504"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1502"/>
+        <location filename="../core/profile.c" line="1523"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Tecto calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1520"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1510"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1510"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1508"/>
+        <location filename="../core/profile.c" line="1529"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Compartimento %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1527"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1516"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1516"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1514"/>
+        <location filename="../core/profile.c" line="1536"/>
         <source>ICD in leading tissue
 </source>
         <translation>Contradifusão hiperbárica no tecido director
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1529"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1518"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1518"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1516"/>
+        <location filename="../core/profile.c" line="1538"/>
         <source>heart rate: %d
 </source>
         <translation>frequência cardíaca: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1531"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1520"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1520"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1518"/>
+        <location filename="../core/profile.c" line="1540"/>
         <source>bearing: %d
 </source>
         <translation>Rumo: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1534"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1523"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1523"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1521"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>profundidade média até aqui %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1631"/>
+        <location filename="../core/profile.c" line="1640"/>
         <source>ΔT:%d:%02dmin</source>
         <translation>ΔT:%d:%02dmin</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1635"/>
+        <location filename="../core/profile.c" line="1644"/>
         <source>%s ΔD:%.1f%s</source>
         <translation>%s ΔD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1639"/>
+        <location filename="../core/profile.c" line="1648"/>
         <source>%s ↓D:%.1f%s</source>
         <translation>%s ↓D:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1643"/>
+        <location filename="../core/profile.c" line="1652"/>
         <source>%s ↑D:%.1f%s</source>
         <translation>%s ↑D:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1647"/>
+        <location filename="../core/profile.c" line="1656"/>
         <source>%s øD:%.1f%s
 </source>
         <translation>%s øD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1651"/>
+        <location filename="../core/profile.c" line="1660"/>
         <source>%s ↓V:%.2f%s</source>
         <translation>%s ↓V:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1655"/>
+        <location filename="../core/profile.c" line="1664"/>
         <source>%s ↑V:%.2f%s</source>
         <translation>%s ↑V:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1659"/>
+        <location filename="../core/profile.c" line="1668"/>
         <source>%s øV:%.2f%s</source>
         <translation>%s øV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1666"/>
+        <location filename="../core/profile.c" line="1675"/>
         <source>%s ΔP:%d%s</source>
         <translation>%s ΔP:%d%s</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1620"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1620"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1618"/>
-        <source>%sT:%d:%02dmin</source>
-        <translation>%sT:%d:%02dmin</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1655"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1655"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1653"/>
-        <source>%s %sP:%d%s</source>
-        <translation>%s %sP:%d%s</translation>
-    </message>
-    <message>
-        <location filename="../core/profile.c" line="1691"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1680"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1680"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1678"/>
+        <location filename="../core/profile.c" line="1700"/>
         <source>%s SAC:%.*f%s/min</source>
         <translation>%s SAC:%.*f%s/min</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1624"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1628"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1632"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1624"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1628"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1632"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1622"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1626"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1630"/>
-        <source>%s %sD:%.1f%s</source>
-        <translation>%s %sD:%.1f%s</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1636"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1636"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1634"/>
-        <source>%s %sD:%.1f%s
-</source>
-        <translation>%s %sD:%.1f%s
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1640"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1640"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1638"/>
-        <source>%s%sV:%.2f%s</source>
-        <translation>%s%sV:%.2f%s</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1644"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1648"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1644"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1648"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1642"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1646"/>
-        <source>%s %sV:%.2f%s</source>
-        <translation>%s %sV:%.2f%s</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="62"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="62"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="62"/>
+        <location filename="../core/qthelper.cpp" line="70"/>
         <source>%1km</source>
         <translation>%1km</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="64"/>
+        <location filename="../core/qthelper.cpp" line="72"/>
         <source>%1m</source>
         <translation>%1m</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="68"/>
+        <location filename="../core/qthelper.cpp" line="76"/>
         <source>%1mi</source>
         <translation>%1mi</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="70"/>
+        <location filename="../core/qthelper.cpp" line="78"/>
         <source>%1yd</source>
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="223"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="223"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="223"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="236"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="233"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="224"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="237"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="93"/>
-        <location filename="../core/qthelper.cpp" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="225"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="225"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="225"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="238"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="93"/>
-        <location filename="../core/qthelper.cpp" line="235"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="226"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="239"/>
         <source>W</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="581"/>
-        <location filename="../core/qthelper.cpp" line="758"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="760"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="760"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="760"/>
+        <location filename="../core/qthelper.cpp" line="585"/>
+        <location filename="../core/qthelper.cpp" line="762"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="584"/>
-        <location filename="../core/qthelper.cpp" line="760"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="762"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="762"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="762"/>
+        <location filename="../core/qthelper.cpp" line="588"/>
+        <location filename="../core/qthelper.cpp" line="764"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="835"/>
-        <location filename="../core/qthelper.cpp" line="1177"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1199"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1195"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1195"/>
+        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>AIR</source>
         <translation>Ar</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="839"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="839"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="841"/>
         <source>EAN</source>
         <translation>EANx</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="912"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="914"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="914"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="914"/>
+        <location filename="../core/qthelper.cpp" line="916"/>
         <source>more than %1 days</source>
         <translation>mais de %1 dias</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="958"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="977"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="976"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="976"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation><numerusform>(% mergulho)</numerusform><numerusform>(%n mergulhos)</numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1177"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1199"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1195"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1195"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>OXYGEN</source>
         <translation>OXIGÉNIO</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1272"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1294"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1290"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1290"/>
+        <location filename="../core/qthelper.cpp" line="1276"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="478"/>
-        <location filename="../core/save-html.c" line="562"/>
-        <location filename="../core/worldmap-save.c" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="476"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="476"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="476"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="113"/>
+        <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>Não é possível abrir o ficheiro %s</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="495"/>
+        <location filename="../core/save-html.c" line="501"/>
         <source>Number</source>
         <translation>Número</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="496"/>
+        <location filename="../core/save-html.c" line="502"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="497"/>
+        <location filename="../core/save-html.c" line="503"/>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="498"/>
+        <location filename="../core/save-html.c" line="504"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="499"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="499"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="499"/>
+        <location filename="../core/save-html.c" line="505"/>
         <source>Air temp.</source>
         <translation>Temp. do ar</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="500"/>
+        <location filename="../core/save-html.c" line="506"/>
         <source>Water temp.</source>
         <translation>Temp. da água</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="501"/>
+        <location filename="../core/save-html.c" line="507"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="502"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="502"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="502"/>
+        <location filename="../core/save-html.c" line="508"/>
         <source>Expand all</source>
         <translation>Expandir todos</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="503"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="503"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="503"/>
+        <location filename="../core/save-html.c" line="509"/>
         <source>Collapse all</source>
         <translation>Colapsar todos</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="504"/>
+        <location filename="../core/save-html.c" line="510"/>
         <source>Trips</source>
         <translation>Viagens</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="505"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="505"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="511"/>
         <source>Statistics</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="506"/>
+        <location filename="../core/save-html.c" line="512"/>
         <source>Advanced search</source>
         <translation>Pesquisa avançada</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="511"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="509"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="509"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="509"/>
+        <location filename="../core/save-html.c" line="515"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="512"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="510"/>
+        <location filename="../core/save-html.c" line="516"/>
         <source>Visibility</source>
         <translation>Visibilidade</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="511"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="511"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="511"/>
+        <location filename="../core/save-html.c" line="517"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="512"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="512"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="512"/>
+        <location filename="../core/save-html.c" line="518"/>
         <source>Divemaster</source>
         <translation>Guia de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="513"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="513"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="513"/>
+        <location filename="../core/save-html.c" line="519"/>
         <source>Buddy</source>
         <translation>Companheiros</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="514"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="514"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="514"/>
+        <location filename="../core/save-html.c" line="520"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
         <location filename="../core/divesite-helper.cpp" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divesite-helper.cpp" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divesite-helper.cpp" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divesite-helper.cpp" line="21"/>
         <source>No dive site layout categories set in preferences!</source>
         <translation>Não foram definidas nas preferências, as categorias para o layout dos locais de mergulho!</translation>
     </message>
     <message>
         <location filename="../core/divesite-helper.cpp" line="29"/>
-        <location filename="../core/save-html.c" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divesite-helper.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divesite-helper.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divesite-helper.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="515"/>
+        <location filename="../core/save-html.c" line="521"/>
         <source>Tags</source>
         <translation>Categorias</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <location filename="../smtk-import/smartrak.c" line="256"/>
-        <location filename="../smtk-import/smartrak.c" line="329"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="329"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="329"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="329"/>
+        <location filename="../core/save-html.c" line="522"/>
+        <location filename="../smtk-import/smartrak.c" line="257"/>
+        <location filename="../smtk-import/smartrak.c" line="330"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="517"/>
+        <location filename="../core/save-html.c" line="523"/>
         <source>Show more details</source>
         <translation>Mostrar mais detalhes</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="520"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="520"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="520"/>
+        <location filename="../core/save-html.c" line="526"/>
         <source>Yearly statistics</source>
         <translation>Estatísticas anuais</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="521"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="521"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="521"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Year</source>
         <translation>Ano</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="522"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="522"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="522"/>
+        <location filename="../core/save-html.c" line="528"/>
         <source>Total time</source>
         <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="523"/>
+        <location filename="../core/save-html.c" line="529"/>
         <source>Average time</source>
         <translation>Duração média</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="524"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="524"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="524"/>
+        <location filename="../core/save-html.c" line="530"/>
         <source>Shortest time</source>
         <translation>Duração mais curta</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="525"/>
+        <location filename="../core/save-html.c" line="531"/>
         <source>Longest time</source>
         <translation>Duração mais longa</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="526"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="526"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="526"/>
+        <location filename="../core/save-html.c" line="532"/>
         <source>Average depth</source>
         <translation>Profundidade média</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="529"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="527"/>
+        <location filename="../core/save-html.c" line="533"/>
         <source>Min. depth</source>
         <translation>Prof. mínima</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="530"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="528"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="528"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="528"/>
+        <location filename="../core/save-html.c" line="534"/>
         <source>Max. depth</source>
         <translation>Prof. Max.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="529"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="529"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="529"/>
+        <location filename="../core/save-html.c" line="535"/>
         <source>Average SAC</source>
         <translation>Consumo médio à superfície</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="530"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="530"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="530"/>
+        <location filename="../core/save-html.c" line="536"/>
         <source>Min. SAC</source>
         <translation>Consumo mínimo</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="531"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="531"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="531"/>
+        <location filename="../core/save-html.c" line="537"/>
         <source>Max. SAC</source>
         <translation>Consumo máximo</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="532"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="532"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="532"/>
+        <location filename="../core/save-html.c" line="538"/>
         <source>Average temp.</source>
         <translation>Temperatura média</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="533"/>
+        <location filename="../core/save-html.c" line="539"/>
         <source>Min. temp.</source>
         <translation>Temperatura mínima</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="534"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="534"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="534"/>
+        <location filename="../core/save-html.c" line="540"/>
         <source>Max. temp.</source>
         <translation>Temperatura máxima</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="541"/>
         <source>Back to list</source>
         <translation>Regressar à lista</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="538"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="538"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="538"/>
+        <location filename="../core/save-html.c" line="544"/>
         <source>Dive #</source>
         <translation>Mergulho #</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="539"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="539"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="539"/>
+        <location filename="../core/save-html.c" line="545"/>
         <source>Dive profile</source>
         <translation>Perfil de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="540"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="540"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="540"/>
+        <location filename="../core/save-html.c" line="546"/>
         <source>Dive information</source>
         <translation>Informações sobre o mergulhoq</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="541"/>
+        <location filename="../core/save-html.c" line="547"/>
         <source>Dive equipment</source>
         <translation>Equipamento de mergulho</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <location filename="../core/save-html.c" line="551"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="549"/>
+        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="555"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="543"/>
+        <location filename="../core/save-html.c" line="549"/>
         <source>Size</source>
         <translation>Capacidade</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="544"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="544"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="544"/>
+        <location filename="../core/save-html.c" line="550"/>
         <source>Work pressure</source>
         <translation>Pressão de serviço</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="545"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="545"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="545"/>
+        <location filename="../core/save-html.c" line="551"/>
         <source>Start pressure</source>
         <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="548"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="546"/>
+        <location filename="../core/save-html.c" line="552"/>
         <source>End pressure</source>
         <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="547"/>
+        <location filename="../core/save-html.c" line="553"/>
         <source>Gas</source>
         <translation>Gás</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="550"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="548"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="548"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="554"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="550"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="550"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="550"/>
+        <location filename="../core/save-html.c" line="556"/>
         <source>Events</source>
         <translation>Eventos</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="551"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="551"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="551"/>
+        <location filename="../core/save-html.c" line="557"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="554"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="552"/>
+        <location filename="../core/save-html.c" line="558"/>
         <source>Value</source>
         <translation>Valor</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="555"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="553"/>
+        <location filename="../core/save-html.c" line="559"/>
         <source>Coordinates</source>
         <translation>Coordenadas</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="556"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="554"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="554"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="554"/>
+        <location filename="../core/save-html.c" line="560"/>
         <source>Dive status</source>
         <translation>Estado do mergulho</translation>
     </message>
     <message>
         <location filename="../core/statistics.c" line="146"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/statistics.c" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/statistics.c" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/statistics.c" line="136"/>
         <source>All (by type stats)</source>
         <translation>Todas (estatísticas por tipo)</translation>
     </message>
@@ -19466,138 +11867,87 @@ EADD: %d%s / %.1fg/ℓ
         <translation>Todos (estatísticas por temperatura mínima)</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="41"/>
+        <location filename="../core/dive.c" line="29"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="42"/>
+        <location filename="../core/dive.c" line="30"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="43"/>
+        <location filename="../core/dive.c" line="31"/>
         <source>Freedive</source>
         <translation>Apneia</translation>
     </message>
     <message>
         <location filename="../core/statistics.c" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/statistics.c" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/statistics.c" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/statistics.c" line="186"/>
         <source>All (by trip stats)</source>
         <translation>Todos (estatísticas por viagem)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="113"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jan</source>
         <translation>Jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="113"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="113"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="113"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="113"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="113"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="29"/>
+        <location filename="../core/uemis-downloader.c" line="34"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
@@ -19606,10 +11956,7 @@ Desligue/ligue o computador de mergulho
 e clique em &quot;Repetir&quot;</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="30"/>
+        <location filename="../core/uemis-downloader.c" line="35"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
@@ -19618,782 +11965,473 @@ Desligue/volte a ligar o computador de mergulho
 e clique Tentar novamente</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="31"/>
+        <location filename="../core/uemis-downloader.c" line="36"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation>Tempo de escrita do ficheiro req.txt demasiado curto.
 O Uemis Zurich está correctamente ligado?</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="32"/>
+        <location filename="../core/uemis-downloader.c" line="37"/>
         <source>No dives to download.</source>
         <translation>Sem mergulhos para descarregar.</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="507"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="507"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="507"/>
+        <location filename="../core/uemis-downloader.c" line="501"/>
         <source>%s %s</source>
         <translation>%s %s</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="534"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="527"/>
+        <location filename="../core/uemis-downloader.c" line="537"/>
         <source>data</source>
         <translation>dados</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="562"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="555"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="555"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="555"/>
+        <location filename="../core/uemis-downloader.c" line="565"/>
         <source>dive log #</source>
         <translation>Registo de mergulhos #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="557"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="557"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="557"/>
+        <location filename="../core/uemis-downloader.c" line="567"/>
         <source>dive spot #</source>
         <translation>local de mergulho #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="559"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="559"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="559"/>
+        <location filename="../core/uemis-downloader.c" line="569"/>
         <source>details for #</source>
         <translation>detalhes para #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="794"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="789"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>wetsuit</source>
         <translation>fato húmido</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="794"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="789"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>semidry</source>
         <translation>fato semi-seco</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="794"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="789"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>drysuit</source>
         <translation>fato seco</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>shorty</source>
         <translation>short</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>vest</source>
         <translation>casaco</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>long john</source>
         <translation>calças</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>jacket</source>
         <translation>colete</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>full suit</source>
         <translation>fato completo</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>2 pcs full suit</source>
         <translation>Fato completo de 2 peças</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="791"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="791"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="791"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>membrane</source>
         <translation>membrana</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1335"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="1329"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="1329"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="1329"/>
+        <location filename="../core/uemis-downloader.c" line="1338"/>
         <source>Initialise communication</source>
         <translation>Inicializar comunicação</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1338"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="1332"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="1332"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="1332"/>
+        <location filename="../core/uemis-downloader.c" line="1341"/>
         <source>Uemis init failed</source>
         <translation>Falha ao iniciar Uemis</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1350"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="1344"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="1344"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="1344"/>
+        <location filename="../core/uemis-downloader.c" line="1353"/>
         <source>Start download</source>
         <translation>Começar transferência</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="201"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="200"/>
         <source>Safety stop violation</source>
         <translation>Violação da paragem de segurança</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="203"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="202"/>
         <source>Speed alarm</source>
         <translation>Alarme de velocidade</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="205"/>
         <source>Speed warning</source>
         <translation>Aviso de velocidade</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="208"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="207"/>
         <source>pO₂ green warning</source>
         <translation>alarme verde de pO₂</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="210"/>
         <source>pO₂ ascend warning</source>
         <translation>aviso de subida de pO₂ </translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="212"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="212"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="212"/>
         <source>pO₂ ascend alarm</source>
         <translation>alarme de subida de pO₂ </translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="217"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="216"/>
         <source>Tank pressure info</source>
         <translation>Informação da pressão da garrafa</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="219"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="218"/>
         <source>RGT warning</source>
         <translation>Aviso de RGT</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="220"/>
         <source>RGT alert</source>
         <translation>Alerta de RGT</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="223"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="222"/>
         <source>Tank change suggested</source>
         <translation>Sugerida mudança de garrafa</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="225"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="224"/>
         <source>Depth limit exceeded</source>
         <translation>Excedido o limite de profundidade </translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="226"/>
         <source>Max deco time warning</source>
         <translation>Aviso de tempo de descompressão máximo</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="228"/>
         <source>Dive time info</source>
         <translation>Informação sobre o tempo de mergulho</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="231"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="230"/>
         <source>Dive time alert</source>
         <translation>Alerta de tempo de mergulho</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="233"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="232"/>
         <source>Marker</source>
         <translation>Marcador</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="235"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="234"/>
         <source>No tank data</source>
         <translation>Sem dados da garrafa</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="237"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="236"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="236"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="236"/>
         <source>Low battery warning</source>
         <translation>Aviso de bateria baixa</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="239"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="238"/>
         <source>Low battery alert</source>
         <translation>Alerta de bateria baixa</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="41"/>
+        <location filename="../core/worldmap-save.c" line="44"/>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="43"/>
+        <location filename="../core/worldmap-save.c" line="46"/>
         <source>Time:</source>
         <translation>Tempo;</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="45"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="45"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="45"/>
+        <location filename="../core/worldmap-save.c" line="48"/>
         <source>Duration:</source>
         <translation>Duração:</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
+        <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="139"/>
-        <location filename="../core/worldmap-save.c" line="47"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurface-qt/DiveObjectHelper.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templatelayout.h" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurface-qt/DiveObjectHelper.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templatelayout.h" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurface-qt/DiveObjectHelper.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templatelayout.h" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="107"/>
+        <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="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="139"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="100"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurface-qt/DiveObjectHelper.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templatelayout.h" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurface-qt/DiveObjectHelper.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templatelayout.h" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurface-qt/DiveObjectHelper.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templatelayout.h" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="107"/>
+        <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="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/qthelper.h" line="76"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.h" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templatelayout.h" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.h" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templatelayout.h" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.h" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templatelayout.h" line="111"/>
+        <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>seg</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="154"/>
+        <location filename="../core/divelogexportlogic.cpp" line="153"/>
         <source>Cannot find a folder called &apos;theme&apos; in the standard locations</source>
         <translation>Não foi possível encontrar uma pasta chamada &apos;tema&apos; nas localizações padrão</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="49"/>
+        <location filename="../core/worldmap-save.c" line="52"/>
         <source>Max. depth:</source>
         <translation>Profundidade máxima:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="52"/>
+        <location filename="../core/worldmap-save.c" line="55"/>
         <source>Air temp.:</source>
         <translation>Temperatura do ar:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="55"/>
+        <location filename="../core/worldmap-save.c" line="58"/>
         <source>Water temp.:</source>
         <translation>Temperatura da água:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="57"/>
+        <location filename="../core/worldmap-save.c" line="60"/>
         <source>Location:</source>
         <translation>Local:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="62"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="61"/>
+        <location filename="../core/worldmap-save.c" line="64"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="252"/>
+        <location filename="../smtk-import/smartrak.c" line="253"/>
         <source>Built</source>
         <translation>Construído</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="252"/>
+        <location filename="../smtk-import/smartrak.c" line="253"/>
         <source>Sank</source>
         <translation>Afundado</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="252"/>
+        <location filename="../smtk-import/smartrak.c" line="253"/>
         <source>Sank Time</source>
         <translation>Hora de imersão</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="253"/>
+        <location filename="../smtk-import/smartrak.c" line="254"/>
         <source>Reason</source>
         <translation>Razão</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="253"/>
+        <location filename="../smtk-import/smartrak.c" line="254"/>
         <source>Nationality</source>
         <translation>Nacionalidade</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="253"/>
+        <location filename="../smtk-import/smartrak.c" line="254"/>
         <source>Shipyard</source>
         <translation>Estaleiro</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="254"/>
+        <location filename="../smtk-import/smartrak.c" line="255"/>
         <source>ShipType</source>
         <translation>Tipo de navio</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="254"/>
+        <location filename="../smtk-import/smartrak.c" line="255"/>
         <source>Length</source>
         <translation>Comprimento</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="254"/>
+        <location filename="../smtk-import/smartrak.c" line="255"/>
         <source>Beam</source>
         <translation>Boca</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="255"/>
+        <location filename="../smtk-import/smartrak.c" line="256"/>
         <source>Draught</source>
         <translation>Calado</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="255"/>
+        <location filename="../smtk-import/smartrak.c" line="256"/>
         <source>Displacement</source>
         <translation>Deslocamento</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="255"/>
+        <location filename="../smtk-import/smartrak.c" line="256"/>
         <source>Cargo</source>
         <translation>Carga</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="267"/>
+        <location filename="../smtk-import/smartrak.c" line="268"/>
         <source>Wreck Data</source>
         <translation>Dados do naufrágio</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="328"/>
+        <location filename="../smtk-import/smartrak.c" line="329"/>
         <source>Altitude</source>
         <translation>Altitude</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="328"/>
+        <location filename="../smtk-import/smartrak.c" line="329"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
         <location filename="../profile-widget/diveprofileitem.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveprofileitem.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveprofileitem.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveprofileitem.cpp" line="190"/>
         <source>planned waypoint above ceiling</source>
         <translation>o waypoint planeado está acima do tecto</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="9"/>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="10"/>
         <source>Ocean</source>
         <translation>Mar</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="11"/>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="12"/>
         <source>State</source>
         <translation>Estado</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="13"/>
         <source>County</source>
         <translation>Provícia</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="14"/>
         <source>Town</source>
         <translation>Vila</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="15"/>
         <source>City</source>
         <translation>Cidade</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="913"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-git.c" line="934"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-git.c" line="934"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-git.c" line="934"/>
+        <location filename="../core/save-git.c" line="916"/>
         <source>Start saving data</source>
         <translation>Iniciar registo dos dados</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="922"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-git.c" line="943"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-git.c" line="943"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-git.c" line="943"/>
+        <location filename="../core/save-git.c" line="925"/>
         <source>Start saving dives</source>
         <translation>Iniciar registo dos mergulhos</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-git.c" line="976"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-git.c" line="976"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-git.c" line="976"/>
+        <location filename="../core/save-git.c" line="958"/>
         <source>Done creating local cache</source>
         <translation>Armazenamento local criado com sucesso</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="1206"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-git.c" line="1227"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-git.c" line="1227"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-git.c" line="1227"/>
+        <location filename="../core/save-git.c" line="1209"/>
         <source>Preparing to save data</source>
         <translation>A prerarar para gravar dados</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1661"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1666"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1666"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1666"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1658"/>
         <source>modechange</source>
         <translation>alterar modo</translation>
     </message>
     <message>
         <location filename="../core/gpslocation.h" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/gpslocation.h" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/gpslocation.h" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/gpslocation.h" line="14"/>
         <source>Waiting to aquire GPS location</source>
         <translation>À espera para adquirir uma localização de GPS</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="65"/>
         <source>Remove this point</source>
         <translation>Remover este ponto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="556"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="633"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="633"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="569"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="559"/>
         <source>Don&apos;t save an empty log to the cloud</source>
         <translation>Não gravar um ficheiro vazio remotamente</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="45"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="35"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/>
         <source>Average</source>
         <translation>Média</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="48"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="38"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
         <source>Minimum</source>
         <translation>Mínima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="51"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="41"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
         <source>Maximum</source>
         <translation>Máxima</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="401"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="401"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="401"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="406"/>
         <source>Invalid response from server</source>
         <translation>Resposta inválida do servidor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="409"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="414"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Esperada a tag XML &apos;DiveDateReader&apos;. Em vez disso foi recebida a &apos;%1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="455"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="455"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="455"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="460"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>A tag XML esperada &apos;DiveDates&apos; não foi encontrada</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="462"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="462"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="462"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="467"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Resposta XML mal formada. Linha %1: %2</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="124"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="122"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="742"/>
+        <location filename="../core/save-xml.c" line="749"/>
         <source>Failed to save dives to %s (%s)</source>
         <translation>Falha ao gravar mergulhos para %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="863"/>
+        <location filename="../core/save-xml.c" line="871"/>
         <source>Failed to save divesites to %s (%s)</source>
         <translation>Falha ao gravar locais de mergulho para %s (%s)</translation>
     </message>
@@ -20402,169 +12440,106 @@ O Uemis Zurich está correctamente ligado?</translation>
     <name>main</name>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="15"/>
         <source>Subsurface-mobile</source>
         <translation>Subsurface-mobile</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="206"/>
         <source>Dive list</source>
         <translation>Lista de mergulhos</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="233"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="233"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="233"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="233"/>
         <source>Dive management</source>
         <translation>Gestão de mergulhos</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="295"/>
         <source>Disable auto cloud sync</source>
         <translation>Desactivar a sincronização automática com a nuvel</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="295"/>
         <source>Enable auto cloud sync</source>
         <translation>Ligar sincronização automática com a nuvem</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="343"/>
         <source>Disable location service</source>
         <translation>Desactivar serviços de geolocalização</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="365"/>
         <source>Settings</source>
         <translation>Definições</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="238"/>
         <source>Add dive manually</source>
         <translation>Adicionar um mergulho manualmente</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="252"/>
         <source>Download from DC</source>
         <translation>Descarregar do computador de mergulho</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="273"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="273"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="273"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="273"/>
         <source>Manual sync with cloud</source>
         <translation>Sincronizar manualmente com a nuvem </translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Desligar a sincronização automática para o armazenamento remoto faz com que todos os dados sejam armazenados localmente. Isto pode ser útil em situações em que não haja internet ou com ligações limitadas. Por favor escolha &apos;Sincronização manual com o armazenamento remoto&apos; se tem ligação à rede e deseja sincronizar os seus dados com a nuvem.</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="312"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="400"/>
         <source>Help</source>
         <translation>Ajuda</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="264"/>
         <source>Apply GPS fixes</source>
         <translation>Aplicar as posições de GPS</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="319"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="319"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="319"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="319"/>
         <source>Show GPS fixes</source>
         <translation>Mostrar pontos GPS</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="332"/>
         <source>Clear GPS cache</source>
         <translation>Limpar a memória GPS</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="378"/>
         <source>Developer</source>
         <translation>Desenvolvedores</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="381"/>
         <source>App log</source>
         <translation>Registo da app</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="389"/>
         <source>Theme information</source>
         <translation>Informações sobre o tema</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="354"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="343"/>
         <source>Run location service</source>
         <translation>Activar serviço de localização</translation>
     </message>
@@ -20580,36 +12555,24 @@ O Uemis Zurich está correctamente ligado?</translation>
     <name>plannerDetails</name>
     <message>
         <location filename="../desktop-widgets/plannerDetails.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerDetails.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerDetails.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerDetails.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerDetails.h" line="92"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerDetails.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerDetails.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerDetails.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerDetails.ui" line="43"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerDetails.h" line="93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Detalhes do plano de mergulho&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerDetails.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerDetails.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerDetails.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerDetails.ui" line="59"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerDetails.h" line="94"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerDetails.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerDetails.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerDetails.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerDetails.ui" line="92"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerDetails.h" line="95"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -20627,36 +12590,24 @@ p, li { white-space: pre-wrap; }
     <name>plannerSettingsWidget</name>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="560"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="74"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="561"/>
         <source>Rates</source>
         <translation>Velocidades</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="95"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="562"/>
         <source>Ascent</source>
         <translation>Subida</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="104"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="563"/>
         <source>below 75% avg. depth</source>
         <translation>abaixo de 75% da profundidade média</translation>
@@ -20667,21 +12618,6 @@ p, li { white-space: pre-wrap; }
         <location filename="../desktop-widgets/plannerSettings.ui" line="145"/>
         <location filename="../desktop-widgets/plannerSettings.ui" line="162"/>
         <location filename="../desktop-widgets/plannerSettings.ui" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="206"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="564"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="566"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="568"/>
@@ -20692,90 +12628,60 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="121"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="565"/>
         <source>75% to 50% avg. depth</source>
         <translation>75%-50% da profundidade média</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="138"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="567"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% da profundidade média para 6 m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="155"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="569"/>
         <source>6m to surface</source>
         <translation>6 m para a superfície</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="571"/>
         <source>Descent</source>
         <translation>Descida</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="187"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="572"/>
         <source>surface to the bottom</source>
         <translation>da superfície para o fundo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="240"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="574"/>
         <source>Planning</source>
         <translation>Planeamento</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="372"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="343"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="585"/>
         <source>Min. switch duration O₂% below 100%</source>
         <translation>Duração mínima para trocas de O2 com % menor que 100%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="439"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="419"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="419"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="419"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="595"/>
         <source>VPM-B deco</source>
         <translation>Descompressão VPM-B</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="502"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="426"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="426"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="426"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="596"/>
         <source>Bühlmann deco</source>
         <translation>Descompressão Bühlmann</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="512"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="436"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="597"/>
         <source>Reserve gas</source>
         <translation>Gás de reserva</translation>
@@ -20784,15 +12690,6 @@ p, li { white-space: pre-wrap; }
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="621"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="621"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="621"/>
         <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"/>
@@ -20802,12 +12699,6 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../desktop-widgets/plannerSettings.ui" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="406"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="583"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="594"/>
         <source>%</source>
@@ -20815,27 +12706,18 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="293"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="293"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="293"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
         <translation>Atrasar mudança de gás de não for necessária uma paragem</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="296"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="580"/>
         <source>Only switch at required stops</source>
         <translation>Mudar apenas nas paragens obrigatórias</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="352"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="363"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="586"/>
         <source>Plan backgas breaks</source>
         <translation>Planear intervalos na mistura de fundo</translation>
@@ -20844,12 +12726,6 @@ p, li { white-space: pre-wrap; }
         <location filename="../desktop-widgets/plannerSettings.ui" line="333"/>
         <location filename="../desktop-widgets/plannerSettings.ui" line="536"/>
         <location filename="../desktop-widgets/plannerSettings.ui" line="821"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="800"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="800"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="800"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="587"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="643"/>
         <source>min</source>
@@ -20857,72 +12733,48 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="389"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="589"/>
         <source>Last stop at 6m</source>
         <translation>Última paragem aos 6 m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="419"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="396"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="591"/>
         <source>Maximize bottom time allowed by gas and no decompression limits</source>
         <translation>Maximizar to tempo de fundo permitido pelo gás disponível e pelos limites de descompressão mínima</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="399"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="593"/>
         <source>Recreational mode</source>
         <translation>Modo recreativo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="336"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="584"/>
         <source>Drop to first depth</source>
         <translation>Descer para a primeira profundidade</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="449"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="449"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="449"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="449"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="598"/>
         <source>Safety stop</source>
         <translation>Paragem de segurança</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="485"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="599"/>
         <source>Conservatism level</source>
         <translation>Nível de conservacionismo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="600"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="515"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="602"/>
         <source>Dive mode</source>
         <translation>Modo de mergulho</translation>
@@ -20939,9 +12791,6 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="525"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="603"/>
         <source>Gas options</source>
         <translation>Opções de gás</translation>
@@ -20949,12 +12798,6 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="567"/>
         <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="608"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="608"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="608"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="604"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="607"/>
         <source>ℓ/min</source>
@@ -20962,207 +12805,138 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="661"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="640"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="640"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="640"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="741"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="741"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="741"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="631"/>
         <source>Compute variations of plan (performance cost)</source>
         <translation>Computar variações do plano (implicações em termos de performance)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="765"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="744"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="744"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="744"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="633"/>
         <source>Display plan variations</source>
         <translation>Mostrar variações ao plano</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="782"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="761"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="761"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="761"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="635"/>
         <source>SAC factor</source>
         <translation>Factor SAC</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="768"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="768"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="768"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="637"/>
         <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source>
         <translation>Usado para calcular a reserva. Considerar 2 mergulhadores com um consumo mais elevado depois de um incidente.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="811"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="790"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="639"/>
         <source>Problem solving time</source>
         <translation>Tempo para resolução de problemas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="818"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="797"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="797"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="797"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="641"/>
         <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source>
         <translation>Usado para calcular a reserva. Tempo adicional à profundidade máxima após um incidente.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="637"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="637"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="637"/>
         <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>Usado para calcular a melhor mistura. Seleccionar a profundidade desta mistura em &quot;Gases disponíveis&quot;, seguido de &quot;B&quot; (melhor mistura trimix) ou &quot;BN&quot; (melhor mistura nitrox)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="313"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="313"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="313"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="582"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="303"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="581"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="677"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="656"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="613"/>
         <source>Bottom SAC</source>
         <translation>Consumo no fundo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="663"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="663"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="663"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="614"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ no fundo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="691"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="670"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="670"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="670"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="615"/>
         <source>Best mix END</source>
         <translation>END da mistura ideal</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="677"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="677"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="677"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="616"/>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="736"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="715"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="715"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="715"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="623"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Mostrar runtime (tempo absoluto) das paragens no plano de mergulho </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="739"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="718"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="718"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="718"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="625"/>
         <source>Display runtime</source>
         <translation>Mostrar runtime</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="749"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="728"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="728"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="728"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="627"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Mostrar duração (tempo relativo) das paragens no plano de mergulho</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="752"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="731"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="629"/>
         <source>Display segment duration</source>
         <translation>Mostrar duração dos segmentos</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="726"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="705"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="705"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="705"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="619"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Listar as transições no plano de mergulho ou tratá-las como implícitas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="729"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="708"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="708"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="708"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="621"/>
         <source>Display transitions in deco</source>
         <translation>Mostrar transições na descompressão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="719"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="698"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="698"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="617"/>
         <source>Verbatim dive plan</source>
         <translation>Plano de mergulho textual</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="775"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="754"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="754"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="754"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="634"/>
         <source>Deco pO₂</source>
         <translation>pO₂ na descompressão</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="580"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="559"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="559"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="559"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="605"/>
         <source>Deco SAC</source>
         <translation>Consumo durante a descompressão</translation>
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index de75c9169..99eb018ea 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -4,20 +4,11 @@
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="10"/>
         <location filename="../mobile-widgets/qml/About.qml" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/About.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/About.qml" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/About.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/About.qml" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/About.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/About.qml" line="20"/>
         <source>About Subsurface-mobile</source>
         <translation>Om Subsurface-mobile</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/About.qml" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/About.qml" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/About.qml" line="37"/>
         <source>A mobile version of the free Subsurface divelog software.
 </source>
         <translation>En mobil version av Subsurface divelog.
@@ -25,16 +16,11 @@
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="38"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/About.qml" line="38"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/About.qml" line="38"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/About.qml" line="38"/>
         <source>View your dive logs while on the go.</source>
         <translation>Ta del av av dina dykloggar under resan.</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/About.qml" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/About.qml" line="49"/>
         <source>Version: %1
 
 © Subsurface developer team
@@ -45,46 +31,12 @@
 2011-2019</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/About.qml" line="49"/>
-        <source>Version: %1
-
-© Subsurface developer team
-2011-2018</source>
-        <translation>Version: %1
-
-© Subsurface utvecklingsteam
-2011-2018</translation>
-    </message>
-    <message>
         <location filename="../mobile-widgets/qml/About.qml" line="62"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/About.qml" line="62"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/About.qml" line="62"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/About.qml" line="62"/>
         <source>Copy logs to clipboard</source>
         <translation>Kopiera loggar till urklipp</translation>
     </message>
 </context>
 <context>
-    <name>AddDivesToTrip</name>
-    <message numerus="yes">
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="700"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="700"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="700"/>
-        <source>add %n dives to trip</source>
-        <translation><numerusform>lägg till %n dyk till resa</numerusform><numerusform>lägg till %n dyk till resa</numerusform></translation>
-    </message>
-</context>
-<context>
-    <name>AutogroupDives</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="720"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="720"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="720"/>
-        <source>autogroup dives</source>
-        <translation>autogruppera dyk</translation>
-    </message>
-</context>
-<context>
     <name>BackButton</name>
     <message>
         <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="50"/>
@@ -96,84 +48,51 @@
     <name>BtDeviceSelectionDialog</name>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="240"/>
         <source>Remote Bluetooth device selection</source>
         <translation>Val av Bluetooth-enhet</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="172"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="32"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="32"/>
         <source>Discovered devices</source>
         <translation>Upptäckta enheter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="22"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="35"/>
         <source>Save</source>
         <translation>Spara</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="35"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="37"/>
         <source>Quit</source>
         <translation>Avsluta</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="193"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="193"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="193"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="251"/>
         <source>Bluetooth mode</source>
         <translation>Bluetooth-läge</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="201"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="201"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="201"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="252"/>
         <source>Auto</source>
         <translation>Automatisk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="206"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="253"/>
         <source>Force LE</source>
         <translation>Tvinga LE</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="211"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="254"/>
         <source>Force classical</source>
         <translation>Tvinga klassisk</translation>
@@ -190,174 +109,102 @@
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="229"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="33"/>
         <source>Scan</source>
         <translation>Sök</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="242"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="34"/>
         <source>Clear</source>
         <translation>Rensa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="66"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="26"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="26"/>
         <source>Local Bluetooth device details</source>
         <translation>Detaljer för lokal Bluetooth-enhet</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="75"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="245"/>
         <source>Name: </source>
         <translation>Namn:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="89"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="28"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="28"/>
         <source>Address:</source>
         <translation>Adress:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="118"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="30"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="30"/>
         <source>Bluetooth powered on</source>
         <translation>Bluetooth är aktiverat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="140"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="31"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="31"/>
         <source>Turn on/off</source>
         <translation>Slå på/av</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.ui" line="150"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="27"/>
         <location filename="../subsurface/desktop-widgets/ui_btdeviceselectiondialog.h" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="27"/>
         <source>Select device:</source>
         <translation>Välj enhet:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
         <source>Name:</source>
         <translation>Namn:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="101"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Försöker slå på Bluetooth...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="104"/>
         <source>Trying to turn off the local Bluetooth device...</source>
         <translation>Försöker stänga av Bluetooth...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="132"/>
         <source>Remote devices list was cleared.</source>
         <translation>Listan av enheter rensades.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="144"/>
         <source>Scanning for remote devices...</source>
         <translation>Söker efter andra enheter...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="157"/>
         <source>Scanning finished successfully.</source>
         <translation>Sökning avslutad.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
         <source>The local Bluetooth device was %1.</source>
         <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
         <translation>Bluetooth %1.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
         <source>turned on</source>
         <translation>aktiverad</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="168"/>
         <source>turned off</source>
         <translation>avaktiverad</translation>
     </message>
@@ -365,15 +212,6 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="186"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="335"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="335"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="335"/>
         <source>UNPAIRED</source>
         <translation>EJ_PARKOPPLAD</translation>
     </message>
@@ -381,15 +219,6 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="190"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="323"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="333"/>
         <source>PAIRED</source>
         <translation>PARKOPPLAD</translation>
     </message>
@@ -397,249 +226,135 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="193"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="328"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="337"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="334"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="334"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="334"/>
         <source>AUTHORIZED_PAIRED</source>
         <translation>PARKOPPLING_GODKÄND</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="205"/>
         <source>%1 (%2)   [State: %3]</source>
         <translation>%1 (%2) [Status: %3]</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="228"/>
         <source>The device %1 can be used for connection. You can press the Save button.</source>
         <translation>Enheten %1 kan nu användas för anslutningar. Du kan klicka på spara.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="244"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="351"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="351"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="351"/>
         <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source>
         <translation>Enheten %1 måste parkopplas för att kunna användas. Du kan använda kontextmenyn för parkopplingsmöjligheter.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="247"/>
         <source>A device needs a non-zero address for a connection.</source>
         <translation>En enhet behöver en adress </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="267"/>
         <source>The local device was changed.</source>
         <translation>Den lokala enheten uppdaterades.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="286"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="283"/>
         <source>Pair</source>
         <translation>Parkoppla</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="287"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="284"/>
         <source>Remove pairing</source>
         <translation>Ta bort parkoppling</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="300"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="300"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="300"/>
         <source>Trying to pair device %1</source>
         <translation>Försöker att parkoppla med %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="304"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="304"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="304"/>
         <source>Trying to unpair device %1</source>
         <translation>Försöker ta bort parkopplingen med %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="319"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="316"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="316"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="316"/>
         <source>Device %1 was unpaired.</source>
         <translation>Parkopplingsinformation med enhet %1 raderades</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="326"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="323"/>
         <source>Device %1 was paired.</source>
         <translation>Parkopplad med %1.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="331"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="328"/>
         <source>Device %1 was paired and is authorized.</source>
         <translation>Enheten %1 parkopplades och är nu auktoriserad.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="356"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="354"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Enheten %1 kan nu användas för anslutningar. Du kan klicka på spara.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="368"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="366"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="366"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="366"/>
         <source>Local device error: %1.</source>
         <translation>Fel i lokal enhet: %1.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="367"/>
         <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source>
         <translation>Parkopplingsfel. Om enheten kräver en speciell PIN-kod, försök istället att para ihop enheterna via operativsystemet.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="369"/>
         <source>Unknown error</source>
         <translation>Okänt fel</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source>
         <translation>Bluetooth-enheten är avslagen, slå på den innan sökning påbörjas.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="381"/>
         <source>Writing to or reading from the device resulted in an error.</source>
         <translation>Skriva till eller läsa från enheten resulterade i ett fel.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="384"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="384"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="384"/>
         <source>An unknown error has occurred.</source>
         <translation>Ett okänt fel har uppstått.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="388"/>
         <source>Device discovery error: %1.</source>
         <translation>Fel vid sökning efter enhet: %1.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="439"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="439"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="439"/>
         <source>Not available</source>
         <translation>Inte tillgänglig</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="446"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="446"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="446"/>
         <source>The local Bluetooth adapter cannot be accessed.</source>
         <translation>Problem med åtkomst till den lokala Bluetooth-enheten.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="487"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/btdeviceselectiondialog.cpp" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/btdeviceselectiondialog.cpp" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/btdeviceselectiondialog.cpp" line="485"/>
         <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source>
         <translation>Agenten för enhetssökning skapades inte eftersom adressen %1 inte stämmer med den fysiska adressen för någon lokal Bluetooth-enhet.</translation>
     </message>
 </context>
 <context>
-    <name>BuddyFilter</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="587"/>
-        <source>Person</source>
-        <translation>Person</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="588"/>
-        <source>Searches for buddies and divemasters</source>
-        <translation>Sök efter parkamrater och divemasters</translation>
-    </message>
-</context>
-<context>
-    <name>BuddyFilterModel</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/filtermodels.cpp" line="491"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/filtermodels.cpp" line="491"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/filtermodels.cpp" line="491"/>
-        <source>No buddies</source>
-        <translation>Ingen parkamrat</translation>
-    </message>
-</context>
-<context>
     <name>CheckCloudConnection</name>
     <message numerus="yes">
         <location filename="../core/checkcloudconnection.cpp" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/checkcloudconnection.cpp" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/checkcloudconnection.cpp" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/checkcloudconnection.cpp" line="58"/>
         <source>Waiting for cloud connection (%n second(s) passed)</source>
         <translation><numerusform>Väntar på molnkontakt (%n sekund passerad)</numerusform><numerusform>Väntar på anslutning till molntjänst (%n sekund(er) passerade)</numerusform></translation>
     </message>
     <message>
         <location filename="../core/checkcloudconnection.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/checkcloudconnection.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/checkcloudconnection.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/checkcloudconnection.cpp" line="65"/>
         <source>Cloud connection failed</source>
         <translation>Anslutning till molnlagringstjänsten misslyckades</translation>
     </message>
@@ -648,65 +363,41 @@
     <name>CloudCredentials</name>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="49"/>
         <source>Cloud credentials</source>
         <translation>Inställningar molnlagringstjänst</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="55"/>
         <source>Email</source>
         <translation>E-post</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="71"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="89"/>
         <source>PIN</source>
         <translation>PIN</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="106"/>
         <source>Register</source>
         <translation>Registrera</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="117"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="133"/>
         <source>Sign-in or Register</source>
         <translation>Logga in/registrera</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/CloudCredentials.qml" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/CloudCredentials.qml" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/CloudCredentials.qml" line="144"/>
         <source>No cloud mode</source>
         <translation>Lokalt läge</translation>
     </message>
@@ -714,10 +405,7 @@
 <context>
     <name>CloudStorageAuthenticate</name>
     <message>
-        <location filename="../core/cloudstorage.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cloudstorage.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cloudstorage.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cloudstorage.cpp" line="65"/>
+        <location filename="../core/cloudstorage.cpp" line="66"/>
         <source>Cloud account verification required, enter PIN in preferences</source>
         <translation>Verifiering av molntjänstkonto krävs, ange PIN under inställningar</translation>
     </message>
@@ -725,295 +413,187 @@
 <context>
     <name>ColumnNameProvider</name>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Dive #</source>
         <translation>Dyk #</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Cyl. size</source>
         <translation>Flaskstorlek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="67"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
         <source>Start pressure</source>
         <translation>Starttryck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>End pressure</source>
         <translation>Sluttryck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Max. depth</source>
         <translation>Max. djup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Avg. depth</source>
         <translation>Medeldjup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Air temp.</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="68"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
         <source>Water temp.</source>
         <translation>Vattentemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>Sample time</source>
         <translation>Samplingstid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>Sample depth</source>
         <translation>Samplingsdjup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>Sample temperature</source>
         <translation>Samplingstemperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>Sample pO₂</source>
         <translation>Sampling pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>Sample CNS</source>
         <translation>Sampling CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="69"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
         <source>Sample NDL</source>
         <translation>Sampling NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="70"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="73"/>
         <source>Sample TTS</source>
         <translation>Sampling TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="70"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="73"/>
         <source>Sample stopdepth</source>
         <translation>Samplingsstoppdjup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="70"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="73"/>
         <source>Sample pressure</source>
         <translation>Samplingstryck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="71"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Sampling sensor1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="71"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Sampling sensor2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="71"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Sampling sensor3 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="72"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="75"/>
         <source>Sample setpoint</source>
         <translation>Samplings setpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="72"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="75"/>
         <source>Visibility</source>
         <translation>Sikt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="72"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="75"/>
         <source>Rating</source>
         <translation>Betyg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="75"/>
         <source>Sample heartrate</source>
         <translation>sampling hjärtfrekvens</translation>
     </message>
@@ -1022,22 +602,16 @@
     <name>Command</name>
     <message>
         <location filename="../desktop-widgets/command_base.cpp" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_base.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_base.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_base.cpp" line="17"/>
         <source>&amp;Undo</source>
         <translation>&amp;Ångra</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/command_base.cpp" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_base.cpp" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_base.cpp" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_base.cpp" line="22"/>
         <source>&amp;Redo</source>
         <translation>&amp;Gör om</translation>
     </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="77"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="92"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation><numerusform>Redigera %1 (%n dyk)</numerusform><numerusform>Redigera %1 (%n dyk)</numerusform></translation>
@@ -1046,10 +620,7 @@
 <context>
     <name>Command::AddDive</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="488"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="488"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="488"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="380"/>
         <source>add dive</source>
         <translation>lägg till dyk</translation>
     </message>
@@ -1057,7 +628,7 @@
 <context>
     <name>Command::AddDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="83"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="79"/>
         <source>add dive site</source>
         <translation>lägg till dykplats</translation>
     </message>
@@ -1065,7 +636,7 @@
 <context>
     <name>Command::AddDivesToTrip</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="669"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="690"/>
         <source>add %n dives to trip</source>
         <translation><numerusform>lägg till %n dyk till resan</numerusform><numerusform>lägg till %n dyk till resan</numerusform></translation>
     </message>
@@ -1073,7 +644,7 @@
 <context>
     <name>Command::AutogroupDives</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="689"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="710"/>
         <source>autogroup dives</source>
         <translation>autogruppera dyk</translation>
     </message>
@@ -1081,7 +652,7 @@
 <context>
     <name>Command::CreateTrip</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="676"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="697"/>
         <source>create trip</source>
         <translation>skapa resa</translation>
     </message>
@@ -1089,10 +660,7 @@
 <context>
     <name>Command::DeleteDive</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="530"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="558"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="558"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="558"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="532"/>
         <source>delete %n dive(s)</source>
         <translation><numerusform>radera %n dyk</numerusform><numerusform>radera %n dyk</numerusform></translation>
     </message>
@@ -1100,7 +668,7 @@
 <context>
     <name>Command::DeleteDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="864"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="885"/>
         <source>delete dive computer</source>
         <translation>radera dykdator</translation>
     </message>
@@ -1108,7 +676,7 @@
 <context>
     <name>Command::DeleteDiveSites</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divesite.cpp" line="141"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="137"/>
         <source>delete %n dive site(s)</source>
         <translation><numerusform>radera %n dykplats</numerusform><numerusform>radera %n dykplats(er)</numerusform></translation>
     </message>
@@ -1116,7 +684,7 @@
 <context>
     <name>Command::EditAirTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="229"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="241"/>
         <source>air temperature</source>
         <translation>lufttemperatur</translation>
     </message>
@@ -1124,7 +692,7 @@
 <context>
     <name>Command::EditAtmPress</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="274"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="286"/>
         <source>Atm. pressure</source>
         <translation>Atm. tryck</translation>
     </message>
@@ -1132,7 +700,7 @@
 <context>
     <name>Command::EditDepth</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="322"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="334"/>
         <source>depth</source>
         <translation>djup</translation>
     </message>
@@ -1140,7 +708,7 @@
 <context>
     <name>Command::EditDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="344"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="356"/>
         <source>dive site</source>
         <translation>dykplats</translation>
     </message>
@@ -1148,7 +716,7 @@
 <context>
     <name>Command::EditDiveSiteCountry</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="265"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="275"/>
         <source>Edit dive site country</source>
         <translation>Redigera land för dykplats</translation>
     </message>
@@ -1156,7 +724,7 @@
 <context>
     <name>Command::EditDiveSiteDescription</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="219"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="229"/>
         <source>Edit dive site description</source>
         <translation>Redigera beskrivning av dykplats</translation>
     </message>
@@ -1164,7 +732,7 @@
 <context>
     <name>Command::EditDiveSiteLocation</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="290"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="302"/>
         <source>Edit dive site location</source>
         <translation>Redigera dykplats</translation>
     </message>
@@ -1172,7 +740,7 @@
 <context>
     <name>Command::EditDiveSiteName</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="196"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="205"/>
         <source>Edit dive site name</source>
         <translation>Redigera namn för dykplats</translation>
     </message>
@@ -1180,7 +748,7 @@
 <context>
     <name>Command::EditDiveSiteNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="242"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="252"/>
         <source>Edit dive site notes</source>
         <translation>Redigera dykplatsanteckningar</translation>
     </message>
@@ -1188,7 +756,7 @@
 <context>
     <name>Command::EditDiveSiteTaxonomy</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="319"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="332"/>
         <source>Edit dive site taxonomy</source>
         <translation>Redigera taxonomi för dykplats</translation>
     </message>
@@ -1196,7 +764,7 @@
 <context>
     <name>Command::EditDuration</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="298"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="310"/>
         <source>duration</source>
         <translation>varaktighet</translation>
     </message>
@@ -1204,7 +772,7 @@
 <context>
     <name>Command::EditNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="144"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="156"/>
         <source>notes</source>
         <translation>anteckningar</translation>
     </message>
@@ -1212,7 +780,7 @@
 <context>
     <name>Command::EditRating</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="187"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="199"/>
         <source>rating</source>
         <translation>betyg</translation>
     </message>
@@ -1220,7 +788,7 @@
 <context>
     <name>Command::EditSuit</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="166"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="178"/>
         <source>suit</source>
         <translation>dräkt</translation>
     </message>
@@ -1252,7 +820,7 @@
 <context>
     <name>Command::EditVisibility</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="208"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="220"/>
         <source>visibility</source>
         <translation>sikt</translation>
     </message>
@@ -1260,7 +828,7 @@
 <context>
     <name>Command::EditWaterTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="253"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="265"/>
         <source>water temperature</source>
         <translation>vattentemperatur</translation>
     </message>
@@ -1268,7 +836,7 @@
 <context>
     <name>Command::ImportDiveSites</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="105"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="101"/>
         <source>import dive sites from %1</source>
         <translation>Importera dykplatser från %1</translation>
     </message>
@@ -1276,7 +844,7 @@
 <context>
     <name>Command::ImportDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="452"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="454"/>
         <source>import %n dive(s) from %1</source>
         <translation><numerusform>importera %n dyk från %1</numerusform><numerusform>importera %n dyk från %1</numerusform></translation>
     </message>
@@ -1284,7 +852,7 @@
 <context>
     <name>Command::MergeDiveSites</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="347"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="360"/>
         <source>merge dive sites</source>
         <translation>sammanfoga dykplatser</translation>
     </message>
@@ -1292,7 +860,7 @@
 <context>
     <name>Command::MergeDives</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="869"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="890"/>
         <source>merge dive</source>
         <translation>sammanfoga dyk</translation>
     </message>
@@ -1300,7 +868,7 @@
 <context>
     <name>Command::MoveDiveComputerToFront</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="858"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="879"/>
         <source>move dive computer to front</source>
         <translation>Lägg dykdator överst</translation>
     </message>
@@ -1308,15 +876,15 @@
 <context>
     <name>Command::PurgeUnusedDiveSites</name>
     <message>
-        <location filename="../desktop-widgets/command_divesite.cpp" line="161"/>
+        <location filename="../desktop-widgets/command_divesite.cpp" line="157"/>
         <source>purge unused dive sites</source>
-        <translation>rensa bort oanvända dykplatser</translation>
+        <translation>radera oanvända dykplatser</translation>
     </message>
 </context>
 <context>
     <name>Command::RemoveAutogenTrips</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="657"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="678"/>
         <source>remove autogenerated trips</source>
         <translation>ta bort autogenererade resor</translation>
     </message>
@@ -1324,7 +892,7 @@
 <context>
     <name>Command::RemoveDivesFromTrip</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="645"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="666"/>
         <source>remove %n dive(s) from trip</source>
         <translation><numerusform>ta bort %n dyk från resan</numerusform><numerusform>ta bort %n dyk från resan</numerusform></translation>
     </message>
@@ -1332,7 +900,7 @@
 <context>
     <name>Command::RenumberDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="607"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="614"/>
         <source>renumber %n dive(s)</source>
         <translation><numerusform>uppdatera numrering för %n dyk</numerusform><numerusform>uppdatera numrering för %n dyk</numerusform></translation>
     </message>
@@ -1340,7 +908,7 @@
 <context>
     <name>Command::ShiftTime</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_divelist.cpp" line="569"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="571"/>
         <source>shift time of %n dives</source>
         <translation><numerusform>ändra tid för %n dyk</numerusform><numerusform>ändra tid för %n dyk</numerusform></translation>
     </message>
@@ -1348,7 +916,7 @@
 <context>
     <name>Command::SplitDiveComputer</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="802"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="823"/>
         <source>split dive computer</source>
         <translation>Dela dykdator</translation>
     </message>
@@ -1356,7 +924,7 @@
 <context>
     <name>Command::SplitDives</name>
     <message>
-        <location filename="../desktop-widgets/command_divelist.cpp" line="784"/>
+        <location filename="../desktop-widgets/command_divelist.cpp" line="805"/>
         <source>split dive</source>
         <translation>dela dyk</translation>
     </message>
@@ -1364,66 +932,42 @@
 <context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="181"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="221"/>
+        <location filename="../core/configuredivecomputer.cpp" line="183"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Kunde inte spara backupfil %1. Felmeddelande: %2</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="237"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="237"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="237"/>
+        <location filename="../core/configuredivecomputer.cpp" line="199"/>
         <source>Could not open backup file: %1</source>
         <translation>Kunde inte öppna backupfil: %1</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="545"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="585"/>
+        <location filename="../core/configuredivecomputer.cpp" line="547"/>
         <source>Dive computer details read successfully</source>
         <translation>Lyckades avläsa information från dykdatorn</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="554"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="594"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="594"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="594"/>
+        <location filename="../core/configuredivecomputer.cpp" line="556"/>
         <source>Setting successfully written to device</source>
         <translation>Inställningarna sparades till enheten</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="563"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="603"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="603"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="603"/>
+        <location filename="../core/configuredivecomputer.cpp" line="565"/>
         <source>Device firmware successfully updated</source>
         <translation>Lyckades med att uppdatera enhetens firmware</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="572"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="612"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="612"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="612"/>
+        <location filename="../core/configuredivecomputer.cpp" line="574"/>
         <source>Device settings successfully reset</source>
         <translation>Lyckades återställa enhetens inställningar</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="588"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="628"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="628"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="628"/>
+        <location filename="../core/configuredivecomputer.cpp" line="590"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan inte skapa libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="607"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputer.cpp" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputer.cpp" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputer.cpp" line="647"/>
+        <location filename="../core/configuredivecomputer.cpp" line="609"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Kunde inte upprätta en koppling till dykdatorn.</translation>
     </message>
@@ -1432,153 +976,102 @@
     <name>ConfigureDiveComputerDialog</name>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2535"/>
         <source>Configure dive computer</source>
         <translation>Konfigurera dykdator</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="22"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2536"/>
         <source>Device or mount point</source>
         <translation>Enhet eller monteringspunkt</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2537"/>
         <source>Connect via Bluetooth</source>
         <translation>Anslut via Bluetooth</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2538"/>
         <source>Connect</source>
         <translation>Anslut</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2539"/>
         <source>Disconnect</source>
         <translation>Koppla från</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2540"/>
         <source>Retrieve available details</source>
         <translation>Hämta tillgänglig information</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2542"/>
         <source>Read settings from backup file or from device before writing to the device</source>
         <translation>Läs in inställningarna ifrån en backupfil eller ifrån enheten innan de kan skrivas till enheten</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2544"/>
         <source>Save changes to device</source>
         <translation>Spara ändringar till enheten</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2546"/>
         <source>Read settings from backup file or from device before writing to a backup file</source>
         <translation>Läs in inställningarna ifrån en backupfil eller ifrån enheten innan de kan skrivas till en backupfil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2548"/>
         <source>Backup</source>
         <translation>Backup</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="129"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2549"/>
         <source>Restore backup</source>
         <translation>Återställ backup</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="139"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2550"/>
         <source>Update firmware</source>
         <translation>Uppdatera firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2551"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Spara libdivecomputer-loggfil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2552"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2553"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="241"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2564"/>
         <source>Suunto Vyper family</source>
         <translation>Suunto Vyper familjen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2562"/>
         <source>OSTC 4</source>
         <translation>OSTC 4</translation>
@@ -1588,18 +1081,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1194"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2492"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3567"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1194"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2492"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3567"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1194"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2492"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3567"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1194"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2492"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3567"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2589"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2751"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2911"/>
@@ -1610,12 +1091,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1201"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2499"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1201"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2499"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1201"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2499"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1201"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1624,12 +1099,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1206"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2504"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1206"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2504"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1206"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2504"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1206"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1638,12 +1107,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1211"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2509"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1211"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2509"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1211"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2509"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1211"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1672,72 +1135,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="759"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="799"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="822"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1219"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1767"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1790"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1868"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1934"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1960"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2042"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2058"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2391"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2517"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2888"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2932"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2955"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2991"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3069"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="759"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="799"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="822"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1219"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1767"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1790"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1868"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1934"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1960"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2042"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2058"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2391"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2517"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2888"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2932"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2955"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2991"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3069"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="759"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="799"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="822"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1219"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1767"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1790"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1868"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1934"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1960"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2042"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2058"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2391"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2517"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2888"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2932"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2955"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2991"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -1766,12 +1163,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1230"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2528"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1230"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2528"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1230"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2528"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1230"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1780,12 +1171,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2533"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2533"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2533"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1794,12 +1179,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2538"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2538"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2538"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1808,12 +1187,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1245"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2543"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1245"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2543"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1245"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2543"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1245"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1822,12 +1195,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1254"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1254"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1254"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1254"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1836,12 +1203,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1259"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2557"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1259"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2557"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1259"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2557"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1259"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1852,18 +1213,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1267"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2565"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3662"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1267"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2565"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3662"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1267"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2565"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3662"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1267"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2565"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3662"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2567"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2701"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2879"/>
@@ -1876,18 +1225,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1290"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2588"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3685"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1290"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2588"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3685"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1290"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2588"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3685"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1290"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2588"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3685"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2569"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2702"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2880"/>
@@ -1898,12 +1235,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1301"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2599"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1301"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2599"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1301"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2599"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1301"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1912,12 +1243,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1306"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2604"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1306"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2604"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1306"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2604"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1306"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1926,12 +1251,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1311"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2609"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1311"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2609"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1311"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2609"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1311"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1940,12 +1259,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1326"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2624"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1326"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2624"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1326"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2624"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1326"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1955,15 +1268,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1336"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2634"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1336"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2634"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1336"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -1973,12 +1277,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1346"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2644"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1346"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2644"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1346"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2644"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1346"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -1988,15 +1286,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1356"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2654"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3856"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1356"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2654"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3856"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1356"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2654"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2006,12 +1295,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1366"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2664"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1366"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2664"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1366"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2664"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1366"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2020,12 +1303,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1379"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2677"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1379"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2677"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1379"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2677"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1379"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2033,81 +1310,54 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1398"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1398"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1403"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1403"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1408"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1408"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1413"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1413"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1418"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1418"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1423"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1423"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1428"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1428"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1462"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1462"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1462"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2722"/>
         <source>Compass gain</source>
         <translation>Kompassförstärkning</translation>
@@ -2116,15 +1366,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1472"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2710"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3805"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1472"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2710"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3805"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1472"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2710"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2136,18 +1377,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1479"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2717"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3719"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1479"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2717"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3719"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1479"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2717"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3719"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1479"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2717"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3719"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2570"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2724"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2892"/>
@@ -2158,12 +1387,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1497"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2735"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1497"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2735"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1497"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2735"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1497"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2172,12 +1395,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1502"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2740"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1502"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2740"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1502"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2740"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1502"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2187,15 +1404,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1507"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2745"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1507"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2745"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1507"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2206,15 +1414,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1512"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2750"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1512"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2750"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1512"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2224,12 +1423,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1520"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2758"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1520"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2758"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1520"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2758"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1520"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2237,9 +1430,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1531"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1531"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1531"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1531"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2731"/>
         <source>2s</source>
         <translation>2s</translation>
@@ -2247,12 +1437,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1536"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3775"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1536"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3775"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1536"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3775"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1536"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2261,12 +1445,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="359"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1544"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1544"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1544"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1544"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2573"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2734"/>
         <source>Sampling rate</source>
@@ -2275,12 +1453,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1555"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2769"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1555"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2769"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1555"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2769"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1555"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2289,12 +1461,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1560"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2774"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1560"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2774"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1560"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2774"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1560"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2303,12 +1469,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1565"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2779"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1565"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2779"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1565"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2779"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1565"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2317,12 +1477,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1570"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2784"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1570"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2784"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1570"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2784"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1570"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2332,15 +1486,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="417"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1578"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2792"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1578"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2792"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1578"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2792"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1578"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2792"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2579"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2740"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2904"/>
@@ -2350,12 +1495,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1585"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2799"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1585"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2799"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1585"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2799"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1585"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2365,15 +1504,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="345"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1595"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2809"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="345"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1595"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2809"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="345"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1595"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2383,12 +1513,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="470"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1602"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1602"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1602"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2398,15 +1522,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1628"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2835"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1628"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2835"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1628"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2417,15 +1532,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="463"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1635"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2842"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="463"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1635"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2842"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="463"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1635"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2842"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="463"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1635"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2842"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2582"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2746"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2909"/>
@@ -2435,12 +1541,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1642"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1642"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1642"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1642"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2584"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2747"/>
         <source>Reset Depth</source>
@@ -2450,15 +1550,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="573"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1719"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2875"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="573"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1719"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2875"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="573"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1719"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2875"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="573"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1719"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2875"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2621"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2790"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2944"/>
@@ -2467,9 +1558,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1725"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1725"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1725"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1725"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2752"/>
         <source>Left button sensitivity</source>
         <translation>Känslighet vänster knapp</translation>
@@ -2477,12 +1565,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1732"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3167"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1732"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1732"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1732"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2491,12 +1573,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1739"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1739"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1739"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1739"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2590"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2754"/>
         <source>Alt GF can be selected underwater</source>
@@ -2506,15 +1582,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="596"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1746"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2911"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="596"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1746"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2911"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="596"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1746"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2911"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="596"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1746"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2911"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2592"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2755"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2915"/>
@@ -2524,12 +1591,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2918"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2918"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2918"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2539,15 +1600,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="815"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1760"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2925"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="815"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1760"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2925"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="815"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1760"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2558,15 +1610,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="792"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1783"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2948"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="792"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1783"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2948"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="792"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1783"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2576,12 +1619,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="586"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1806"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1806"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1806"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2591,15 +1628,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="645"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1858"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2984"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="645"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1858"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2984"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="645"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1858"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2984"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="645"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1858"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2984"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2595"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2764"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2922"/>
@@ -2610,15 +1638,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="656"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1901"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3024"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1901"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3024"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1901"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3024"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1901"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3024"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2596"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2767"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2925"/>
@@ -2628,12 +1647,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1906"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3029"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1906"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3029"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1906"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3029"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1906"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2643,15 +1656,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="723"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1924"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3052"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1924"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3052"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1924"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3052"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1924"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3052"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2606"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2771"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2930"/>
@@ -2662,15 +1666,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="749"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1950"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3062"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="749"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3062"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="749"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3062"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="749"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3062"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2608"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2773"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2931"/>
@@ -2681,15 +1676,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="775"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1976"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3085"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="775"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1976"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3085"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="775"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1976"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3085"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="775"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1976"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3085"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2610"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2775"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2933"/>
@@ -2699,12 +1685,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="782"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1983"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="782"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1983"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="782"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1983"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="782"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1983"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2611"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2776"/>
         <source>Saturation</source>
@@ -2712,27 +1692,18 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1993"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1993"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1993"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1993"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2777"/>
         <source>Flip screen</source>
         <translation>Invertera skärm</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2000"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2000"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2000"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2000"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2778"/>
         <source>Right button sensitivity</source>
         <translation>Känslighet höger knapp</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2007"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2007"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2007"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2007"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2779"/>
         <source>MOD warning</source>
         <translation>MOD varning</translation>
@@ -2740,12 +1711,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="838"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2014"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="838"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2014"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="838"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2014"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="838"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2014"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2616"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2780"/>
         <source>Graphical speed indicator</source>
@@ -2753,9 +1718,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2021"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2021"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2021"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2021"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2781"/>
         <source>Dynamic ascent rate</source>
         <translation>Dynamisk uppstigningshastighet</translation>
@@ -2764,15 +1726,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="877"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2028"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3092"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2028"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3092"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2028"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3092"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2028"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3092"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2619"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2782"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2934"/>
@@ -2783,15 +1736,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="884"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2035"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3099"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="884"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2035"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3099"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="884"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2035"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3099"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="884"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2035"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3099"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2620"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2783"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2935"/>
@@ -2801,12 +1745,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2106"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3194"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2106"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3194"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2106"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3194"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2106"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2815,12 +1753,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2113"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3201"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2113"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3201"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2113"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3201"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2113"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2830,15 +1762,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="892"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2133"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3221"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="892"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2133"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3221"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="892"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2133"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3221"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="892"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2133"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3221"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2687"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2865"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3018"/>
@@ -2847,18 +1770,12 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -2874,36 +1791,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1652"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1677"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1699"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1845"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2852"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2971"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1652"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1677"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1699"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1845"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2852"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2971"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1652"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1677"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1699"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1845"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2852"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2925,27 +1812,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="845"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="861"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2090"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3106"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3122"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3138"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="845"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="861"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2090"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3106"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3122"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3138"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="845"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="861"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2090"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3106"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3122"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -2963,24 +1829,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3264"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3349"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="935"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1020"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2176"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3264"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3349"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="935"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1020"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2176"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3264"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3349"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="935"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1020"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2176"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3264"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3349"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2623"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2646"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2792"/>
@@ -2997,24 +1845,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2266"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3269"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3354"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="940"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1025"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2266"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3269"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3354"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="940"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1025"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2266"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3269"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3354"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="940"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1025"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2266"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3269"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3354"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2625"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2648"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2794"/>
@@ -3031,24 +1861,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3274"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3359"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="945"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1030"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2186"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3274"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3359"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="945"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1030"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2186"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3274"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3359"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="945"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1030"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2186"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3274"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3359"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2627"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2650"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2796"/>
@@ -3068,33 +1880,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3279"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3364"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3439"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1035"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1100"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2191"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2276"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3279"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3364"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3439"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1035"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1100"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2191"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2276"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3279"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3364"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3439"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1035"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1100"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2191"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2276"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3279"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3364"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3439"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2629"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2652"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2671"/>
@@ -3111,15 +1896,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="955"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2196"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3284"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2196"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3284"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2196"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3284"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2196"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3284"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2634"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2803"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2957"/>
@@ -3130,15 +1906,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2201"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3289"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2201"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3289"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2201"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3289"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2201"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3289"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2636"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2805"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2959"/>
@@ -3149,15 +1916,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3294"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3294"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3294"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3294"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2638"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2807"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2961"/>
@@ -3168,15 +1926,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="970"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2211"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3299"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="970"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2211"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3299"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="970"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2211"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3299"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="970"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2211"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3299"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2640"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2809"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2963"/>
@@ -3187,15 +1936,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="975"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2216"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3304"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="975"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2216"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3304"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="975"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2216"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3304"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="975"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2216"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3304"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2642"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2811"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2965"/>
@@ -3206,15 +1946,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1040"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2281"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3369"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1040"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2281"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3369"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1040"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2281"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3369"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1040"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2281"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3369"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2657"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2826"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2980"/>
@@ -3225,15 +1956,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1045"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2286"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3374"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1045"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2286"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3374"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1045"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2286"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3374"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1045"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2286"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3374"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2659"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2828"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2982"/>
@@ -3244,15 +1966,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1050"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2291"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3379"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1050"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2291"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3379"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1050"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2291"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3379"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1050"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2291"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3379"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2661"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2830"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2984"/>
@@ -3263,15 +1976,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1055"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2296"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3384"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1055"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2296"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3384"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1055"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2296"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3384"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1055"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2296"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3384"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2663"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2832"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2986"/>
@@ -3282,15 +1986,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1060"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2301"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3389"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1060"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2301"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3389"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1060"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2301"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3389"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1060"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2301"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3389"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2665"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2834"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2988"/>
@@ -3301,15 +1996,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1095"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3434"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1095"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3434"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1095"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3434"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1095"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3434"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2669"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2838"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2992"/>
@@ -3320,15 +2006,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1105"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2356"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3444"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1105"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2356"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3444"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1105"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2356"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3444"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1105"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2356"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3444"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2676"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2845"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2999"/>
@@ -3339,15 +2016,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1110"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2361"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3449"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1110"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2361"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3449"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1110"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2361"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3449"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1110"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2361"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3449"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2678"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2847"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3001"/>
@@ -3358,15 +2026,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1115"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2366"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3454"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1115"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2366"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3454"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1115"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2366"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3454"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1115"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2366"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3454"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2680"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2849"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3003"/>
@@ -3380,24 +2039,6 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2450"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3509"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3525"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1136"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1152"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2450"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3509"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3525"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1136"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1152"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2450"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3509"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3525"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1136"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1152"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2450"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3509"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3525"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2683"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2684"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2861"/>
@@ -3410,12 +2051,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1884"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3007"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1884"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3007"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1884"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3007"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1884"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3007"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2766"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2924"/>
         <source>mbar</source>
@@ -3424,12 +2059,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2371"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3459"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2371"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3459"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2371"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3459"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2371"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3459"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2851"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3005"/>
         <source>SP 4</source>
@@ -3438,12 +2067,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2376"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3464"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2376"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3464"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2376"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3464"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2376"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3464"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2853"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3007"/>
         <source>SP 5</source>
@@ -3451,9 +2074,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2384"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2384"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2384"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2384"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2856"/>
         <source>O₂ in calibration gas</source>
         <translation>O₂ i kalibreringsgas</translation>
@@ -3461,12 +2081,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3473"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3473"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3473"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3473"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2858"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3010"/>
         <source>Fixed setpoint</source>
@@ -3475,12 +2089,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2413"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3478"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2413"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3478"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2413"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3478"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2413"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3478"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2859"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3011"/>
         <source>Sensor</source>
@@ -3488,9 +2096,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3486"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3486"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3486"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3486"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3013"/>
         <source>Setpoint fallback</source>
         <translation>Setpoint reservläge</translation>
@@ -3499,15 +2104,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1168"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2466"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3541"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1168"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2466"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3541"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1168"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2466"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -3518,15 +2114,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1175"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2473"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3548"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1175"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2473"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3548"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1175"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2473"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -3535,27 +2122,18 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3589"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3589"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3589"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3589"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3019"/>
         <source>Safety level</source>
         <translation>Säkerhetsnivå</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3615"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3615"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3615"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3615"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3021"/>
         <source>Altitude range</source>
         <translation>Höjd över havet</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3622"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3622"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3622"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3622"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3022"/>
         <source>Model</source>
         <translation>Modell</translation>
@@ -3563,12 +2141,6 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="338"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3642"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3642"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3642"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -3576,18 +2148,12 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3702"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3702"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3702"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3702"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3026"/>
         <source>Max. depth</source>
         <translation>Max. djup</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3749"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3749"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3749"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3749"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3029"/>
         <source>P0 (none)</source>
         <extracomment>Suunto safety level</extracomment>
@@ -3595,9 +2161,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3754"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3754"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3754"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3754"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3030"/>
         <source>P1 (medium)</source>
         <extracomment>Suunto safety level</extracomment>
@@ -3605,9 +2168,6 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3759"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3759"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3759"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3759"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3031"/>
         <source>P2 (high)</source>
         <extracomment>Suunto safety level</extracomment>
@@ -3615,45 +2175,30 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3767"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3767"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3767"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3767"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3033"/>
         <source>Sample rate</source>
         <translation>Registreringsintervall</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3780"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3780"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3780"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3780"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3035"/>
         <source>20s</source>
         <translation>20s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3785"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3785"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3785"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3785"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3036"/>
         <source>30s</source>
         <translation>30s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3790"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3790"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3790"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3790"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3037"/>
         <source>60s</source>
         <translation>60s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3798"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3798"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3798"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3798"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3039"/>
         <source>Total dive time</source>
         <translation>Total dyktid</translation>
@@ -3664,21 +2209,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1914"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3042"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3822"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3914"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1914"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3042"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3822"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3914"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1914"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3042"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3822"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -3689,45 +2219,30 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3836"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3836"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3836"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3836"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3042"/>
         <source>24h</source>
         <translation>24h</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3841"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3841"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3841"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3841"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3043"/>
         <source>12h</source>
         <translation>12h</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3849"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3849"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3849"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3849"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3045"/>
         <source>Time format</source>
         <translation>Tidsformat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3864"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3864"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3864"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3864"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3047"/>
         <source>Imperial</source>
         <translation>Brittiska</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3869"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3869"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3869"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3869"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3048"/>
         <source>Metric</source>
         <translation>Metriska</translation>
@@ -3737,18 +2252,6 @@
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="1612"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2819"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3880"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="1612"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2819"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3880"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="1612"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2819"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -3758,198 +2261,129 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3887"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3887"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3887"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3887"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3051"/>
         <source>Light</source>
         <translation>Ljus</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3904"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3904"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3904"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3904"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3052"/>
         <source>Depth alarm</source>
         <translation>Djuplarm</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3924"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3924"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3924"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3924"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="3054"/>
         <source>Time alarm</source>
         <translation>Dyktidslarm</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="399"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2575"/>
         <source>MM/DD/YY</source>
         <translation>MM/DD/YY</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="404"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2576"/>
         <source>DD/MM/YY</source>
         <translation>DD/MM/YY</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="409"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2577"/>
         <source>YY/MM/DD</source>
         <translation>YY/MM/DD</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="424"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2580"/>
         <source>Salinity</source>
         <translation>Salthalt</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="666"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="666"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="676"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="676"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="681"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="681"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="686"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="686"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2881"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2881"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2881"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2912"/>
         <source>Travel gas consumption</source>
         <translation>Transportgasförbrukning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2904"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="2904"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="2904"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="2904"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2914"/>
         <source>Button sensitivity</source>
         <translation>Knappkänslighet</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3034"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3034"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3034"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3174"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3174"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.ui" line="3174"/>
         <location filename="../subsurface/desktop-widgets/ui_configuredivecomputerdialog.h" line="2940"/>
         <source>VPM conservatism</source>
         <translation>VPM konservatism</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3181"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.ui" line="3181"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.ui" line="3181"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="895"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="895"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="895"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1366"/>
         <source>Backup dive computer settings</source>
         <translation>Säkerhetskopiera dykdatorns inställningar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/>
         <source>Backup files</source>
         <translation>Backupfiler</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1371"/>
         <source>XML backup error</source>
         <translation>Fel vid backup av XML</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Ett fel inträffade när backupfilen skulle sparas.
@@ -3957,41 +2391,26 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/>
         <source>Backup succeeded</source>
         <translation>Backup lyckades</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Dina inställningar har blivit sparade till: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1387"/>
         <source>Restore dive computer settings</source>
         <translation>Återställ dykdatorns inställningar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1393"/>
         <source>XML restore error</source>
         <translation>Fel vid återställning av XML</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Ett fel inträffade när backupfilen skulle återställas.
@@ -3999,73 +2418,46 @@
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1398"/>
         <source>Restore succeeded</source>
         <translation>Återställning lyckades</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Dina inställningar har blivit återställda</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1409"/>
         <source>Select firmware file</source>
         <translation>Välj firmware-fil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/>
         <source>All files</source>
         <translation>Alla filer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1465"/>
         <source>Log files</source>
         <translation>Loggfiler</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1490"/>
         <source>Connecting to device...</source>
         <translation>Ansluter till enhet...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1516"/>
         <source>Connected to device</source>
         <translation>Ansluten till enhet</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1536"/>
         <source>Disconnected from device</source>
         <translation>Enhet frånkopplad</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="1464"/>
         <source>Choose file for dive computer download logfile</source>
         <translation>Välj fil att spara logg från dykdatorn till</translation>
     </message>
@@ -4142,162 +2534,95 @@
     </message>
 </context>
 <context>
-    <name>CreateTrip</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="707"/>
-        <source>create trip</source>
-        <translation>skapa resa</translation>
-    </message>
-</context>
-<context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Size</source>
         <translation>Storlek</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Work press.</source>
         <translation>Arbetstryck</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../qt-models/cylindermodel.cpp" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="24"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="24"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="24"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="27"/>
         <source>Start press.</source>
         <translation>Starttryck</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>End press.</source>
         <translation>Sluttryck</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>O₂%</source>
         <translation>O₂%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="16"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Deco switch at</source>
         <translation>Deko byte vid</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Bot. MOD</source>
         <translation>Botten MOD</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>MND</source>
         <translation>MND</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Use</source>
         <translation>Använd</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="52"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="54"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="56"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="58"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="247"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="238"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klicka här för att ta bort markerad flaska.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="260"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="259"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="249"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation>Djup för byte av deko gas. Beräknad med Deko pO₂ inställning, om inte värdet är satt manuellt.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="263"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="262"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="251"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max. depth.</source>
         <translation>Beräknad med inställning för botten pO₂. Inställningen MOD modifierar O₂%, sätt till &apos;*&apos; för bästa O₂% för maxdjup.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="265"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max. depth.</source>
         <translation>Beräknad med Bästa Mix END inställningen. MND modifierar He%, &apos;*&apos; medför bästa He% för maxdjup.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/cylindermodel.cpp" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/cylindermodel.cpp" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/cylindermodel.cpp" line="245"/>
+        <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>Denna gas används. Bara flaskor som inte används kan tas bort.</translation>
     </message>
@@ -4305,66 +2630,56 @@
 <context>
     <name>DiveComponentSelection</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="486"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="499"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
         <source>Dive site: </source>
         <translation>Dykplats:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="501"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
         <source>Dive master: </source>
         <translation>Dive master: </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="503"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
         <source>Buddy: </source>
         <translation>Parkamrat:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="505"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="494"/>
         <source>Rating: </source>
         <translation>Betyg:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="494"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="507"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="496"/>
         <source>Visibility: </source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="509"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="498"/>
         <source>Notes:
 </source>
         <translation>Anteckningar:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="511"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="500"/>
         <source>Suit: </source>
         <translation>Dräkt:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="513"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
         <source>Tags: </source>
         <translation>Taggar:</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="523"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="512"/>
         <source>Cylinders:
 </source>
         <translation>Flaskor:
 </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="531"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/>
         <source>Weights:
 </source>
         <translation>Vikter:
@@ -4375,118 +2690,81 @@
     <name>DiveComponentSelectionDialog</name>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="23"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="139"/>
         <source>Component selection</source>
         <translation>Välj delar</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="52"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="140"/>
         <source>Which components would you like to copy</source>
         <translation>Vilken information vill du kopiera</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="141"/>
         <source>Dive site</source>
         <translation>Dykplats</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="129"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="94"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Sikt</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="115"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="73"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="145"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="52"/>
         <source>Which components would you like to copy?</source>
         <translation>Vilken information vill du kopiera?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="146"/>
         <source>Weights</source>
         <translation>Vikter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="101"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="147"/>
         <source>Cylinders</source>
         <translation>Flaskor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="122"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="148"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="146"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="146"/>
         <source>You can paste these to another dive or as text to another application.</source>
         <translation>Du kan klistra in informationen i ett annat dyk eller som text i en annan applikation.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="108"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="149"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomponentselection.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomponentselection.ui" line="136"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomponentselection.h" line="150"/>
         <source>Rating</source>
         <translation>Betyg</translation>
@@ -4496,26 +2774,17 @@
     <name>DiveComputerManagementDialog</name>
     <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
         <location filename="../subsurface/desktop-widgets/ui_divecomputermanagementdialog.h" line="65"/>
         <source>Edit dive computer nicknames</source>
         <translation>Ändra namn för dykdatorer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomputermanagementdialog.cpp" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomputermanagementdialog.cpp" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomputermanagementdialog.cpp" line="42"/>
         <source>Remove the selected dive computer?</source>
         <translation>Radera vald dykdator?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divecomputermanagementdialog.cpp" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divecomputermanagementdialog.cpp" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divecomputermanagementdialog.cpp" line="43"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Är du säker på att du vill
@@ -4526,33 +2795,21 @@ radera den valda dykdatorn?</translation>
     <name>DiveComputerModel</name>
     <message>
         <location filename="../qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divecomputermodel.cpp" line="9"/>
         <source>Model</source>
         <translation>Modell</translation>
     </message>
     <message>
         <location filename="../qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divecomputermodel.cpp" line="9"/>
         <source>Device ID</source>
         <translation>Enhets-ID</translation>
     </message>
     <message>
         <location filename="../qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divecomputermodel.cpp" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divecomputermodel.cpp" line="9"/>
         <source>Nickname</source>
         <translation>Enhetsnamn</translation>
     </message>
     <message>
         <location filename="../qt-models/divecomputermodel.cpp" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divecomputermodel.cpp" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divecomputermodel.cpp" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divecomputermodel.cpp" line="36"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Klicka här för att ta bort markerad dykdator.</translation>
     </message>
@@ -4561,49 +2818,31 @@ radera den valda dykdatorn?</translation>
     <name>DiveDetails</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetails.qml" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetails.qml" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetails.qml" line="55"/>
         <source>Dive details</source>
         <translation>Dykdetaljer</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetails.qml" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetails.qml" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetails.qml" line="150"/>
         <source>Delete dive</source>
         <translation>Radera dyk</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetails.qml" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetails.qml" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetails.qml" line="167"/>
         <source>Cancel edit</source>
         <translation>Avbryt redigering</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetails.qml" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetails.qml" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetails.qml" line="177"/>
         <source>Show on map</source>
         <translation>Visa på kartan</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetails.qml" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetails.qml" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetails.qml" line="192"/>
         <source>Save edits</source>
         <translation>Spara förändringar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetails.qml" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetails.qml" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetails.qml" line="192"/>
         <source>Edit dive</source>
         <translation>Redigera dyk</translation>
     </message>
@@ -4612,41 +2851,26 @@ radera den valda dykdatorn?</translation>
     <name>DiveDetailsEdit</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="158"/>
         <source>Dive %1</source>
         <translation>Dyk %1</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="162"/>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="174"/>
         <source>Location:</source>
         <translation>Plats:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/>
         <source>Coordinates:</source>
         <translation>Koordinater:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/>
         <source>Use current
 GPS location:</source>
         <translation>Använd nuvarande
@@ -4654,73 +2878,46 @@ GPS-position:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Depth:</source>
         <translation>Djup:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="244"/>
         <source>Duration:</source>
         <translation>Varaktighet:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="258"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="258"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="258"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="258"/>
         <source>Air Temp:</source>
         <translation>Lufttemp:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="271"/>
         <source>Water Temp:</source>
         <translation>Vattentemp:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="284"/>
         <source>Suit:</source>
         <translation>Dräkt:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/>
         <source>Buddy:</source>
         <translation>Parkamrat:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="325"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/>
         <source>Weight:</source>
         <translation>Vikt:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="360"/>
         <source>Cylinder1:</source>
         <translation>Flaska1:</translation>
     </message>
@@ -4730,21 +2927,6 @@ GPS-position:</translation>
         <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="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="632"/>
         <source>Gas mix:</source>
         <translation>Gasblandning:</translation>
     </message>
@@ -4754,21 +2936,6 @@ GPS-position:</translation>
         <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="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="451"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="649"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="451"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="649"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="451"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="649"/>
         <source>Start Pressure:</source>
         <translation>Starttryck:</translation>
     </message>
@@ -4778,77 +2945,41 @@ GPS-position:</translation>
         <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="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="467"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="599"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="665"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="467"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="599"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="665"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="467"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="599"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="665"/>
         <source>End Pressure:</source>
         <translation>Sluttryck:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="418"/>
         <source>Cylinder2:</source>
         <translation>Flaska2:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="483"/>
         <source>Cylinder3:</source>
         <translation>Flaska3:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="549"/>
         <source>Cylinder4:</source>
         <translation>Flaska4:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="615"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="615"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="615"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="615"/>
         <source>Cylinder5:</source>
         <translation>Flaska5:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="680"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="680"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="680"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="680"/>
         <source>Rating:</source>
         <translation>Betyg:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="693"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="693"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="693"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="693"/>
         <source>Visibility:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsEdit.qml" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsEdit.qml" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsEdit.qml" line="707"/>
         <source>Notes:</source>
         <translation>Anteckningar:</translation>
     </message>
@@ -4857,105 +2988,66 @@ GPS-position:</translation>
     <name>DiveDetailsView</name>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="228"/>
         <source>No profile to show</source>
         <translation>Ingen profil finns att visa</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="234"/>
         <source>Suit:</source>
         <translation>Dräkt:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="240"/>
         <source>Air Temp:</source>
         <translation>Lufttemp:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="284"/>
         <source>Cylinder:</source>
         <translation>Flaska:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="246"/>
         <source>Water Temp:</source>
         <translation>Vattentemp:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
         <source>Map it</source>
         <translation>Märk på karta</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="112"/>
         <source>Rating:</source>
         <translation>Betyg:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="155"/>
         <source>Visibility:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="337"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="337"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="337"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="291"/>
         <source>Weight:</source>
         <translation>Vikt:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="344"/>
         <source>Buddy:</source>
         <translation>Parkamrat:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="298"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveDetailsView.qml" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveDetailsView.qml" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveDetailsView.qml" line="380"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
@@ -4963,59 +3055,38 @@ GPS-position:</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="184"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="187"/>
         <source> (cyl. %1)</source>
         <translation>(flaska %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="188"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
         <source>ICD</source>
         <translation>ICD</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="189"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="189"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="189"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
         <source>ΔHe</source>
         <translation>ΔHe</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="190"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="193"/>
         <source>ΔN₂</source>
         <translation>ΔN₂</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="211"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="214"/>
         <source>Manual switch to OC</source>
         <translation>Manuellt byte till OC</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="213"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>start</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveeventitem.cpp" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveeventitem.cpp" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveeventitem.cpp" line="214"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="217"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>slut</translation>
@@ -5024,42 +3095,27 @@ GPS-position:</translation>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveimportedmodel.cpp" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveimportedmodel.cpp" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveimportedmodel.cpp" line="39"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="38"/>
         <source>Date/time</source>
         <translation>Datum/tid</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveimportedmodel.cpp" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveimportedmodel.cpp" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveimportedmodel.cpp" line="41"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="40"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveimportedmodel.cpp" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveimportedmodel.cpp" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveimportedmodel.cpp" line="43"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="42"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveimportedmodel.cpp" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveimportedmodel.cpp" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveimportedmodel.cpp" line="78"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveimportedmodel.cpp" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveimportedmodel.cpp" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveimportedmodel.cpp" line="78"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>min</source>
         <translation>Min</translation>
     </message>
@@ -5069,68 +3125,41 @@ GPS-position:</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="340"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="340"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="340"/>
         <source>Dive list</source>
         <translation>Dyklista</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="428"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="346"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="346"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="346"/>
         <source>Cloud credentials</source>
         <translation>Inställningar molnlagringstjänst</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="363"/>
         <source>Please wait, filtering dive list</source>
         <translation>Vänligen vänta, filtrerar dyklista</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="478"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="478"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="478"/>
         <source>Download dives</source>
         <translation>Ladda ner dyk</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="570"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="488"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="488"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="488"/>
         <source>Add dive</source>
         <translation>Nytt dyk</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="580"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="498"/>
         <source>Filter dives</source>
         <translation>Filtrera dyk</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="424"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="342"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="342"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="342"/>
         <source>Please tap the &apos;+&apos; button to add a dive (or download dives from a supported dive computer)</source>
         <translation>Vänligen klicka på &apos;+&apos; knappen för att lägga till ett dyk (eller ladda ner dyk från en supporterad dykdator)</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DiveList.qml" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DiveList.qml" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DiveList.qml" line="363"/>
         <source>No dives in dive list</source>
         <translation>Inga dyk i dyklistan</translation>
     </message>
@@ -5138,12 +3167,12 @@ GPS-position:</translation>
 <context>
     <name>DiveListSortModel</name>
     <message numerus="yes">
-        <location filename="../qt-models/divelistmodel.cpp" line="107"/>
+        <location filename="../qt-models/divelistmodel.cpp" line="108"/>
         <source>(%n dive(s))</source>
         <translation><numerusform>(%n dyk)</numerusform><numerusform>(%n dyk)</numerusform></translation>
     </message>
     <message>
-        <location filename="../qt-models/divelistmodel.cpp" line="109"/>
+        <location filename="../qt-models/divelistmodel.cpp" line="110"/>
         <source>(%L1 shown)</source>
         <translation>(%L1 visas)</translation>
     </message>
@@ -5151,186 +3180,117 @@ GPS-position:</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="905"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="875"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="875"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="875"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="912"/>
         <source>Expand all</source>
         <translation>Visa alla dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="907"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="914"/>
         <source>Collapse all</source>
         <translation>Dölj alla dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="911"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="881"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="881"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="881"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="918"/>
         <source>Collapse others</source>
         <translation>Dölj alla andra dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="915"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="885"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="885"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="885"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
         <source>Remove dive(s) from trip</source>
         <translation>Ta bort dyk från resa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="916"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="886"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="886"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="886"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="923"/>
         <source>Create new trip above</source>
         <translation>Skapa ny resa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="931"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="901"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="901"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="901"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="938"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Lägg till dyk till resan ovanför</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="933"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="903"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="903"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="903"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="940"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Lägg till dyk till resan nedanför</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="937"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="907"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="907"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="907"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
         <source>Merge trip with trip above</source>
         <translation>Sammanfoga med resan ovan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="938"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="908"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="908"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="908"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="945"/>
         <source>Merge trip with trip below</source>
         <translation>Sammanfoga med resan under</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="942"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="912"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="912"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="912"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="949"/>
         <source>Delete dive(s)</source>
         <translation>Radera dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="914"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="914"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="914"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="951"/>
         <source>Mark dive(s) invalid</source>
         <translation>Markera dyk som ogiltiga</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="948"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="918"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="918"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="918"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="955"/>
         <source>Merge selected dives</source>
         <translation>Sammanfoga valda dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="920"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="920"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="920"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
         <source>Renumber dive(s)</source>
         <translation>Uppdatera numrering för dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="951"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="921"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="921"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="921"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
         <source>Shift dive times</source>
         <translation>Korrigera dyktider</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="952"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="922"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="922"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="922"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
         <source>Split selected dives</source>
         <translation>Dela markerade dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="953"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="923"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="923"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="923"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
         <source>Load media from file(s)</source>
         <translation>Lägg till media från fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="954"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="924"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="924"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="924"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="961"/>
         <source>Load media from web</source>
         <translation>Lägg till media från webb</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="980"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="950"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="987"/>
         <source>Open media files</source>
         <translation>Öppna mediafiler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="983"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="953"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="953"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="953"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
         <source>Media files</source>
         <translation>Mediafiler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="984"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="954"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="954"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="954"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
         <source>Image files</source>
         <translation>Bildfiler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="985"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="955"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
         <source>Video files</source>
         <translation>Videofiler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="986"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="956"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="956"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="956"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="993"/>
         <source>All files</source>
         <translation>Alla filer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="1035"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="1012"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="1012"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="1012"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="1042"/>
         <source>%1 does not appear to be an image</source>
         <translation>%1 verkar inte vara en bild</translation>
     </message>
@@ -5338,18 +3298,12 @@ GPS-position:</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../desktop-widgets/locationinformation.cpp" line="326"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="390"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Skapa en ny dykplats, kopiera relevant information från nuvarande dyk.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/locationinformation.cpp" line="327"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="391"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Skapa en ny dykplats med detta namn</translation>
     </message>
@@ -5358,117 +3312,78 @@ GPS-position:</translation>
     <name>DiveLogExportDialog</name>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="372"/>
         <source>Export dive log files</source>
         <translation>Exportera dykloggar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="44"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="392"/>
         <source>General export</source>
         <translation>Exportera</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="103"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="374"/>
         <source>Export format</source>
         <translation>Exportformat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="198"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="375"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="134"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="376"/>
         <source>UDDF</source>
         <translation>UDDF</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="377"/>
         <source>di&amp;velogs.de</source>
         <translation>divelogs.de</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="157"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="378"/>
         <source>DiveShare</source>
         <translation>DiveShare</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="260"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="167"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="379"/>
         <source>CSV dive profile</source>
         <translation>CSV dykprofil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="177"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="380"/>
         <source>CSV dive details</source>
         <translation>CSV dykdetaljer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="290"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="197"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="381"/>
         <source>Worldmap</source>
         <translation>Världskarta</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="300"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="207"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="382"/>
         <source>TeX</source>
         <translation>TeX</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="217"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="383"/>
         <source>I&amp;mage depths</source>
         <translation>Djup på bild</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="263"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="384"/>
         <source>Selection</source>
         <translation>Markering</translation>
@@ -5476,12 +3391,6 @@ GPS-position:</translation>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="117"/>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="372"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="372"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="382"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="385"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="395"/>
         <source>Selected dives</source>
@@ -5489,45 +3398,30 @@ GPS-position:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="282"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="386"/>
         <source>All dives</source>
         <translation>Alla dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="285"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="285"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="295"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="387"/>
         <source>Options</source>
         <translation>Alternativ</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="311"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="388"/>
         <source>Metric</source>
         <translation>Metriska</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="316"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="389"/>
         <source>Imperial</source>
         <translation>Brittiska</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="330"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="391"/>
         <source>Anonymize</source>
         <translation>Avidentifiera</translation>
@@ -5539,7 +3433,6 @@ GPS-position:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="280"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="187"/>
         <source>Dive profile</source>
         <translation>Dykprofil</translation>
     </message>
@@ -5555,423 +3448,277 @@ GPS-position:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="372"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="342"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="415"/>
         <source>HTML</source>
         <translation>HTML</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="350"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="350"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="360"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="393"/>
         <source>General settings</source>
         <translation>Allmänna inställningar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="356"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="356"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="366"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="394"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface siffror</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="425"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="395"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="396"/>
         <source>Export yearly statistics</source>
         <translation>Exportera årlig statistik</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="401"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="401"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="411"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="397"/>
         <source>All di&amp;ves</source>
         <translation>Alla dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="451"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="421"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="398"/>
         <source>Export list only</source>
         <translation>Exportera enbart listan</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="458"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="428"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="399"/>
         <source>Export photos</source>
         <translation>Exportera foton</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="444"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="400"/>
         <source>Style options</source>
         <translation>Utseende</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="489"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="449"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="449"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="401"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="499"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="459"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="459"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="402"/>
         <source>Font size</source>
         <translation>Fontstorlek</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="480"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="403"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="475"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="475"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="485"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="404"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="520"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="480"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="480"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="490"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="405"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="406"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="530"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="490"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="490"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="500"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="407"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="505"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="408"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="540"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="510"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="409"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="548"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="508"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="508"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="518"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="411"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="559"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="529"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="112"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="115"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="105"/>
         <source>Light</source>
         <translation>Ljus</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.ui" line="524"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.ui" line="524"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.ui" line="534"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="413"/>
         <source>Sand</source>
         <translation>Sand</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Generellt format som används för att utbyta data emellan olika dykrelaterade program. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Kommaseparerade värden som beskriver dykprofilen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="84"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="84"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Dykinformation i kommaseparerat format. Inkluderar merparten av dykdetaljer men inte dykprofilen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Skicka dykdata till divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
         <source>Send the dive data to dive-share.appspot.com website.</source>
         <translation>Skicka dykdata till dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="90"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML-export av dykplatser visualiserade på en världskarta.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface standard XML-format.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
         <source>Subsurface dive sites native XML format.</source>
         <translation>Subsurface dykplatser i XML format.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="94"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
         <source>Write depths of images to file.</source>
         <translation>Skriv djupet där bilder tagits till fil.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="96"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
         <source>Write dive as TeX macros to file.</source>
         <translation>Exportera dyk som TeX-makro till fil.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="101"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
         <source>Write dive as LaTeX macros to file.</source>
         <translation>Spara dyk som LaTeX-makro till fil.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="98"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
         <source>Write the profile image as PNG file.</source>
         <translation>Skriv dykprofilbild till en PNG fil. </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="105"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="108"/>
         <source>Write profile data to a CSV file.</source>
         <translation>Skriv profildata till en CSV fil.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="136"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
         <source>Export UDDF file as</source>
         <translation>Exportera UDDF-fil som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
         <source>UDDF files</source>
         <translation>UDDF-filer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="145"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/>
         <source>CSV files</source>
         <translation>CSV-filer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="180"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="203"/>
         <source>HTML files</source>
         <translation>HTML-filer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="164"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="157"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Subsurface files</source>
         <translation>Subsurface filer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="175"/>
         <source>Export Subsurface dive sites XML</source>
         <translation>Exportera Subsurface dykplatser XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="185"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>TeX files</source>
         <translation>TeX-filer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="144"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
         <source>Export CSV file as</source>
         <translation>Exportera CSV-fil som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="151"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/>
         <source>Export world map</source>
         <translation>Exportera världskarta</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="156"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Export Subsurface XML</source>
         <translation>Exportera Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="181"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="165"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
         <source>Save image depths</source>
         <translation>Spara djup för bilder</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="185"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>Export to TeX file</source>
         <translation>Exportera till TeX fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="189"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="173"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Save profile image</source>
         <translation>Spara profilbild</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="196"/>
         <source>Save profile data</source>
         <translation>Spara profildata</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="199"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="179"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="202"/>
         <source>Export HTML files as</source>
         <translation>Exportera HTML filer som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="193"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="216"/>
         <source>Please wait, exporting...</source>
         <translation>Vänligen vänta, exporterar...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="248"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="481"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogexportdialog.cpp" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogexportdialog.cpp" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogexportdialog.cpp" line="433"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="251"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="480"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan inte öppna fil %s</translation>
     </message>
@@ -5980,688 +3727,372 @@ GPS-position:</translation>
     <name>DiveLogImportDialog</name>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="157"/>
         <source>Import dive log file</source>
         <translation>Importera dyk från loggfil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="158"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.yyyy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="94"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="159"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/dd/yyyy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="99"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="160"/>
         <source>yyyy-mm-dd</source>
         <translation>yyyy-mm-dd</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="108"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="162"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="113"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="163"/>
         <source>Minutes</source>
         <translation>Minuter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="118"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="164"/>
         <source>Minutes:seconds</source>
         <translation>Minuter:sekunder</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="127"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="166"/>
         <source>Metric</source>
         <translation>Metriska</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="132"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="167"/>
         <source>Imperial</source>
         <translation>Brittiska</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.ui" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.ui" line="155"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogimportdialog.h" line="169"/>
         <source>Drag the tags above to each corresponding column below</source>
         <translation>Dra taggarna ovan till respektive kolumn nedan</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="374"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="580"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="577"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="577"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="577"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="375"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="581"/>
         <source>Tab</source>
         <translation>Flik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="647"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Vissa kolumnrubriker förhandsifylldes; vänligen dra och släpp rubrikerna till den kolumn de tillhör.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="688"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="812"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="938"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="809"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="931"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="809"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="931"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="809"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="931"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="689"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="813"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
         <source>Sample time</source>
         <translation>Samplingstid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="690"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="687"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="811"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="687"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="811"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="687"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="811"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="691"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="815"/>
         <source>Sample depth</source>
         <translation>Samplingsdjup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="692"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="816"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="689"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="813"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="689"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="813"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="689"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="813"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="693"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="817"/>
         <source>Sample temperature</source>
         <translation>Samplingstemperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="694"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="818"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="691"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="815"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="691"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="815"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="691"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="815"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="695"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="819"/>
         <source>Sample pO₂</source>
         <translation>Sampling pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="696"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="820"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="693"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="817"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="693"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="817"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="693"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="817"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="697"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="821"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Sampling sensor1 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="698"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="822"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="819"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="819"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="819"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="699"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="823"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Sampling sensor2 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="700"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="824"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="697"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="821"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="697"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="821"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="697"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="821"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="701"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="825"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Sampling sensor3 pO₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="702"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="826"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="823"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="823"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="823"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="703"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="827"/>
         <source>Sample CNS</source>
         <translation>Sampling CNS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="704"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="828"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="701"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="825"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="701"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="825"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="701"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="825"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="705"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="829"/>
         <source>Sample NDL</source>
         <translation>Sampling NDL</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="706"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="830"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="703"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="827"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="703"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="827"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="703"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="827"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="707"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="831"/>
         <source>Sample TTS</source>
         <translation>Sampling TTS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="708"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="832"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="705"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="829"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="705"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="829"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="705"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="829"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="709"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="833"/>
         <source>Sample stopdepth</source>
         <translation>Samplingsstoppdjup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="710"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="834"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="831"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="831"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="831"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="711"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="835"/>
         <source>Sample pressure</source>
         <translation>Samplingstryck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="712"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="838"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="709"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="833"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="709"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="833"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="709"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="833"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="713"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="839"/>
         <source>Sample setpoint</source>
         <translation>Samplings setpoint</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="716"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="810"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="942"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="713"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="807"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="935"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="713"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="807"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="935"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="713"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="807"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="935"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="717"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="811"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
         <source>Dive #</source>
         <translation>Dyk #</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="717"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="944"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="714"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="801"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="937"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="714"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="801"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="937"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="714"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="801"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="937"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="718"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="805"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="718"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="808"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="946"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="715"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="805"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="939"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="715"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="805"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="939"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="715"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="805"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="939"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="719"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="809"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="719"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="948"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="716"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="941"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="716"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="941"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="716"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="941"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="720"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="720"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="954"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="717"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="947"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="717"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="947"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="717"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="947"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="721"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
         <source>Max. depth</source>
         <translation>Max. djup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="721"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="956"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="718"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="949"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="718"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="949"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="718"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="949"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="722"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="957"/>
         <source>Avg. depth</source>
         <translation>Medeldjup</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="722"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="988"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="719"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="981"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="719"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="981"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="719"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="981"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="989"/>
         <source>Air temp.</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="990"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="720"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="983"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="720"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="983"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="720"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="983"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="724"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="991"/>
         <source>Water temp.</source>
         <translation>Vattentemp.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="724"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="978"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="721"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="971"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="721"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="971"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="721"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="971"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="725"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="979"/>
         <source>Cyl. size</source>
         <translation>Flaskstorlek</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="725"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="980"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="973"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="973"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="973"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="726"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="981"/>
         <source>Start pressure</source>
         <translation>Starttryck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="726"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="982"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="975"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="975"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="975"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="983"/>
         <source>End pressure</source>
         <translation>Sluttryck</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="984"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="724"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="977"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="724"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="977"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="724"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="977"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="728"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="985"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="728"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="986"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="725"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="979"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="725"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="979"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="725"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="979"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="987"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="950"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="726"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="943"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="726"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="943"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="726"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="943"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="730"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="730"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="952"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="945"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="945"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="727"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="945"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="958"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="728"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="951"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="728"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="951"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="728"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="951"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="732"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="959"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="732"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="960"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="953"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="953"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="729"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="953"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="961"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="962"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="730"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="730"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="730"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="955"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="734"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="963"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="734"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="842"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="994"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="987"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="987"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="987"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="843"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="995"/>
         <source>Rating</source>
         <translation>Betyg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="840"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="992"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="732"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="835"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="985"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="732"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="835"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="985"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="732"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="835"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="985"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="736"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="841"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="993"/>
         <source>Visibility</source>
         <translation>Sikt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="736"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="964"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="957"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="957"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="957"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="966"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="959"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="959"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="959"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="738"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="738"/>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="968"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelogimportdialog.cpp" line="961"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelogimportdialog.cpp" line="961"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="735"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelogimportdialog.cpp" line="961"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="836"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="837"/>
         <source>Sample heartrate</source>
         <translation>sampling hjärtfrekvens</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="1019"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="1020"/>
         <source>multiple files</source>
         <translation>flera filer</translation>
     </message>
 </context>
 <context>
-    <name>DiveObjectHelper</name>
-    <message numerus="yes">
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurface-qt/DiveObjectHelper.cpp" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurface-qt/DiveObjectHelper.cpp" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurface-qt/DiveObjectHelper.cpp" line="344"/>
-        <source>(%n dive(s))</source>
-        <translation><numerusform>(%n dyk)</numerusform><numerusform>(%n dyk)</numerusform></translation>
-    </message>
-</context>
-<context>
     <name>DivePlanner</name>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="74"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="201"/>
         <source>Planned dive time</source>
         <translation>Planerad dyktid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="117"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="202"/>
         <source>Altitude</source>
         <translation>Höjd över havet</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="124"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="203"/>
         <source>ATM pressure</source>
         <translation>Atmosfärtryck</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="166"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="166"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="166"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="144"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="144"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="205"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="131"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="204"/>
         <source>Water type</source>
         <translation>Vattentyp</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="180"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="207"/>
         <source>Fresh water</source>
         <translation>Sötvatten</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="185"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="185"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="185"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="185"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="208"/>
         <source>Sea water</source>
         <translation>Saltvatten</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="190"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="209"/>
         <source>EN13319</source>
         <translation>EN13319</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="195"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="210"/>
         <source>Custom</source>
         <translation>Anpassad</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.ui" line="221"/>
         <location filename="../subsurface/desktop-widgets/ui_diveplanner.h" line="215"/>
         <source>kg/ℓ</source>
         <translation>kg/ℓ</translation>
@@ -6670,98 +4101,62 @@ GPS-position:</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="171"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="171"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="171"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="171"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="173"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="272"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="274"/>
         <source>cyl.</source>
         <translation>flaska</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="378"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
         <source>Final depth</source>
         <translation>Slutdjup</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="380"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
         <source>Run time</source>
         <translation>Löptid</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="382"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="382"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="382"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="384"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="384"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="384"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
         <source>Used gas</source>
         <translation>Gastyp</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="386"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="388"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="388"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="390"/>
         <source>Dive mode</source>
         <translation>Dykläge</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1026"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="1020"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="1020"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="1020"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1028"/>
         <source>min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1032"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="1026"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="1026"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="1026"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1034"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1035"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="1029"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="1029"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="1029"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1037"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1082"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplannermodel.cpp" line="1076"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplannermodel.cpp" line="1076"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplannermodel.cpp" line="1076"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1084"/>
         <source>Stop times</source>
         <translation>Stopptider</translation>
     </message>
@@ -6770,49 +4165,31 @@ GPS-position:</translation>
     <name>DivePlannerWidget</name>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="114"/>
         <source>Dive planner points</source>
         <translation>Dykplanering</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="119"/>
         <source>Available gases</source>
         <translation>Tillgänglig gas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="120"/>
         <source>Add cylinder</source>
         <translation>Lägg till flaska</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="151"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="151"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="151"/>
         <source>Add dive data point</source>
         <translation>lägg till dykdatapunkt</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="161"/>
         <source>Save new</source>
         <translation>Spara ny</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="266"/>
         <source>kg/ℓ</source>
         <translation>kg/ℓ</translation>
     </message>
@@ -6821,169 +4198,106 @@ GPS-position:</translation>
     <name>DivePlotDataModel</name>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="114"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="116"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="118"/>
         <source>Pressure</source>
         <translation>Tryck</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="120"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="122"/>
         <source>Color</source>
         <translation>Färg</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="124"/>
         <source>User entered</source>
         <translation>Användarinmatad</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="126"/>
         <source>Pressure S</source>
         <translation>Tryck S</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure I</source>
         <translation>Tryck I</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="130"/>
         <source>Ceiling</source>
         <translation>Takdjup</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="132"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="134"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="138"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="140"/>
         <source>Setpoint</source>
         <translation>Setpoint</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="142"/>
         <source>Sensor 1</source>
         <translation>Sensor 1</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="144"/>
         <source>Sensor 2</source>
         <translation>Sensor 2</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="146"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="146"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="146"/>
         <source>Sensor 3</source>
         <translation>Sensor 3</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="148"/>
         <source>Ambient pressure</source>
         <translation>Omgivande tryck</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Heart rate</source>
         <translation>Hjärtrytm</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="152"/>
         <source>Gradient factor</source>
         <translation>Gradientfaktor</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/diveplotdatamodel.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/diveplotdatamodel.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Mean depth @ s</source>
         <translation>Medeldjup @ s</translation>
     </message>
@@ -6992,81 +4306,54 @@ GPS-position:</translation>
     <name>DiveShareExportDialog</name>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="178"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="179"/>
         <source>User ID</source>
         <translation>Användarnamn</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="75"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="183"/>
         <source>⌫</source>
         <translation>⌫</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="82"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="184"/>
         <source>Get user ID</source>
         <translation>Hämta användarnamn</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="91"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="91"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="91"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="91"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="185"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:20pt; font-weight:600; color:#ff8000;&quot;&gt;⚠&lt;/span&gt; Not using a UserID means that you will need to manually keep bookmarks to your dives, to find them again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:20pt; font-weight:600; color:#ff8000;&quot;&gt;⚠&lt;/span&gt;Att inte använda ett användarnamn betyder att du på egen hand behöver skapa bokmärken så att du kan hitta dina dyk igen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="104"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="187"/>
         <source>Private dives will not appear in &quot;related dives&quot; lists, and will only be accessible if their URL is known.</source>
         <translation>Privata dyk kommer inte att visas i &quot;related dives&quot; listan, och kommer enbart vara nåbara om du vet deras URL.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="107"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="189"/>
         <source>Keep dives private</source>
         <translation>Håll dyken privata</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="129"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="190"/>
         <source>Upload dive data</source>
         <translation>Ladda upp dykdata</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveshareexportdialog.ui" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveshareexportdialog.ui" line="174"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveshareexportdialog.ui" line="174"/>
         <location filename="../subsurface/desktop-widgets/ui_diveshareexportdialog.h" line="191"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -7083,12 +4370,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveSiteSortedModel</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="271"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="278"/>
         <source>Delete dive site?</source>
         <translation>Radera dykplats?</translation>
     </message>
     <message numerus="yes">
-        <location filename="../qt-models/divelocationmodel.cpp" line="272"/>
+        <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>Dykplatsen har %n registrerade dyk. Vill du verkligen radera den?
@@ -7097,503 +4384,188 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>DiveTripModel</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="399"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="212"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="212"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="401"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="212"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="401"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="403"/>
-        <source>Rating</source>
-        <translation>Betyg</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="365"/>
-        <source>Depth</source>
-        <translation>Djup</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="407"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="407"/>
-        <source>Duration</source>
-        <translation>Varaktighet</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="371"/>
-        <source>Weight</source>
-        <translation>Vikt</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="413"/>
-        <source>Suit</source>
-        <translation>Dräkt</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="369"/>
-        <source>Temp.</source>
-        <translation>Temp.</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="415"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="415"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="415"/>
-        <source>Cylinder</source>
-        <translation>Flaska</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="417"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="379"/>
-        <source>SAC</source>
-        <translation>SAC</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="423"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="425"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="425"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="425"/>
-        <source>Max CNS</source>
-        <translation>Max CNS</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="427"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="427"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="427"/>
-        <source>Tags</source>
-        <translation>Taggar</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="387"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="387"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="387"/>
-        <source>Media</source>
-        <translation>Media</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="389"/>
-        <source>Country</source>
-        <translation>Land</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="431"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="431"/>
-        <source>Buddy</source>
-        <translation>Parkamrat</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="433"/>
-        <source>Location</source>
-        <translation>Plats</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="405"/>
-        <source>Depth(%1)</source>
-        <translation>Djup(%1)</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="69"/>
-        <source>(%1 shown)</source>
-        <translation>(%1 visas)</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="405"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="405"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="409"/>
-        <source>Temp.(%1%2)</source>
-        <translation>Temp.(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="411"/>
-        <source>Weight(%1)</source>
-        <translation>Vikt(%1)</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="411"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="411"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="421"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="421"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="421"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="421"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="421"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="421"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="236"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="236"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="236"/>
-        <source>Max. CNS</source>
-        <translation>Max. CNS</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="429"/>
-        <source>Media before/during/after dive</source>
-        <translation>Media innan/under/efter dyk</translation>
-    </message>
-</context>
-<context>
     <name>DiveTripModelBase</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation>(%1 visas)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="273"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="313"/>
-        <source>#</source>
-        <translation>#</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"/>
-        <source>Date</source>
-        <translation>Datum</translation>
+        <source>#</source>
+        <translation>#</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"/>
-        <source>Rating</source>
-        <translation>Betyg</translation>
+        <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"/>
+        <source>Rating</source>
+        <translation>Betyg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>Depth(%1)</source>
         <translation>Djup(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="281"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="283"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="323"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="323"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="325"/>
         <source>Temp.(°%1)</source>
         <translation>Temp.(°%1)</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="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>Weight(%1)</source>
         <translation>Vikt(%1)</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="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="325"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
         <location filename="../qt-models/divetripmodel.cpp" line="220"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="287"/>
         <location filename="../qt-models/divetripmodel.cpp" line="327"/>
-        <source>Suit</source>
-        <translation>Dräkt</translation>
+        <source>lbs</source>
+        <translation>lbs</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"/>
-        <source>Cylinder</source>
-        <translation>Flaska</translation>
+        <source>Suit</source>
+        <translation>Dräkt</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"/>
+        <source>Cylinder</source>
+        <translation>Flaska</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"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="228"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="335"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="228"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="335"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="295"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="297"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="234"/>
         <source>Max. CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="234"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="299"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="341"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="301"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="343"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="343"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="238"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="345"/>
         <source>Media before/during/after dive</source>
         <translation>Media innan/under/efter dyk</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="238"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="303"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="240"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="305"/>
         <source>Country</source>
         <translation>Land</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="345"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="242"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="307"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="347"/>
         <source>Buddy</source>
         <translation>Parkamrat</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="244"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="309"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="349"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="279"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="281"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="283"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
         <source>Temp.</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="287"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="293"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="295"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="297"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="299"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="341"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="301"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="303"/>
         <source>Media</source>
         <translation>Media</translation>
     </message>
@@ -7601,193 +4573,107 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="488"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="488"/>
-        <source>no dives were selected</source>
-        <translation>inga dyk var markerade</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="167"/>
-        <source>stylesheet to export to divelogs.de is not found</source>
-        <translation>formatmall för export till divelogs.de kan inte hittas</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="177"/>
-        <source>failed to create zip file for upload: %s</source>
-        <translation>misslyckades med att skapa zipfil för uppladdning: %s</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="238"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="243"/>
         <source>internal error</source>
         <translation>internt fel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="246"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation>Konvertering av dyk %1 till divelogs.de format misslyckades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="274"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="274"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="274"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="279"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation>fel vid skrivning av zip-fil: %s zip-fel %d systemfel %d - %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="526"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="717"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="710"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="714"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="714"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="528"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="719"/>
         <source>Done</source>
         <translation>Klar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="557"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="562"/>
         <source>Uploading dive list...</source>
         <translation>Laddar upp dyklista...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="589"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="589"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="594"/>
         <source>Downloading dive list...</source>
         <translation>Laddar ner dyklista...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="626"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="630"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="630"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="635"/>
         <source>Downloading %1 dives...</source>
         <translation>Laddar ner %1 dyk...</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="667"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="660"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="664"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="664"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="669"/>
         <source>Download finished - %1</source>
         <translation>Nedladdning klar - %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="681"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="674"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="678"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="678"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="683"/>
         <source>Problem with download</source>
         <translation>Problem med nedladdning</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="675"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="679"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="679"/>
-        <source>The archive could not be opened:
-</source>
-        <translation>Arkivet kunde inte öppnas:
-</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="688"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="688"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="693"/>
         <source>Corrupted download</source>
         <translation>Misslyckad nedladdning</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="682"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="692"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="689"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="689"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="694"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Arkivet kunde inte öppnas:
 %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="160"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="491"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="162"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="493"/>
         <source>No dives were selected</source>
         <translation>Inga dyk markerades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="170"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="172"/>
         <source>Stylesheet to export to divelogs.de is not found</source>
         <translation>Formatmall för export till divelogs.de kan inte hittas</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="180"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="182"/>
         <source>Failed to create zip file for upload: %s</source>
         <translation>misslyckades med att skapa zipfil för uppladdning: %s</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="718"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="711"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="715"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="715"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="720"/>
         <source>Upload finished</source>
         <translation>Uppladdning klar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="724"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="728"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="728"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/>
         <source>Upload failed</source>
         <translation>Uppladdning misslyckades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="727"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="731"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/>
         <source>Upload successful</source>
         <translation>Uppladdningen lyckades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="737"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="730"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="734"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="739"/>
         <source>Login failed</source>
         <translation>Inloggning misslyckades</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="740"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="733"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="737"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="737"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="742"/>
         <source>Cannot parse response</source>
         <translation>Kan inte tolka respons</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="751"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="744"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="748"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="748"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="753"/>
         <source>Error: %1</source>
         <translation>Fel: %1</translation>
     </message>
@@ -7853,118 +4739,73 @@ Existerande dykplats</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="87"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="86"/>
         <source>Download</source>
         <translation>Ladda ned</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="91"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="90"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Välj nedladdningsläge för Bluetooth</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="177"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="182"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="202"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="205"/>
         <source>Connecting to dive computer</source>
         <translation>Ansluter till dykdator</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="282"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="278"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="277"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/>
         <source>Error</source>
         <translation>Fel</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="331"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="327"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="326"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Uemis dive computer</source>
         <translation>Hitta Uemis dykdator</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="331"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="327"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="326"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Garmin dive computer</source>
         <translation>Sök efter Garmin dykdator</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="351"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="358"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="353"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/>
         <source>Cancel download</source>
         <translation>Avbryt nedladdning</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="430"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="438"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="433"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="455"/>
         <source>Choose file for dive computer download logfile</source>
         <translation>Välj fil att spara logg från dykdatorn till</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="431"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="439"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="435"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="434"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
         <source>Log files</source>
         <translation>Loggfiler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="464"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="460"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="459"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="481"/>
         <source>Choose file for dive computer binary dump file</source>
         <translation>Välj fil för binär dumpning av nerladdningen ifrån dykdatorn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="457"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="465"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="461"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="460"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="482"/>
         <source>Dump files</source>
         <translation>Dumpfiler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="493"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="489"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="488"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="510"/>
         <source>Retry download</source>
         <translation>Försök igen med nedladdning</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="444"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="452"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="448"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="447"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="469"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.cpp" line="453"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.cpp" line="449"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.cpp" line="448"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="470"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Att spara en libdivecomputer-dump kommer inte att ladda ner dyken till dyklistan.</translation>
     </message>
@@ -7973,18 +4814,12 @@ Existerande dykplats</translation>
     <name>DownloadFromDiveComputer</name>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="317"/>
         <source>Download from dive computer</source>
         <translation>Ladda ned från dykdator</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="121"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="329"/>
         <source>Device or mount point</source>
         <translation>Enhet eller monteringspunkt</translation>
@@ -7994,18 +4829,6 @@ Existerande dykplats</translation>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="100"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="100"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="100"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
@@ -8015,282 +4838,176 @@ Existerande dykplats</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="52"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="318"/>
         <source>Force download of all dives</source>
         <translation>Tvinga nedladdning av alla dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="69"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="320"/>
         <source>Always prefer downloaded dives</source>
         <translation>Föredra alltid nedladdad dykinformation</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="142"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="332"/>
         <source>Download into new trip</source>
         <translation>Ladda ner till ny resa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="76"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="321"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Spara libdivecomputer-loggfil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="333"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Spara dumpfil ifrån dykdatorn</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="90"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="322"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Välj nedladdningsläge för Bluetooth</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="97"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="324"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Välj en extern Bluetooth-enhet.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="135"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="331"/>
         <source>Vendor</source>
         <translation>Leverantör</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="59"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="319"/>
         <source>Dive computer</source>
         <translation>Dykdator</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="303"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="392"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="365"/>
+        <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="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="334"/>
         <source>Download</source>
         <translation>Ladda ner</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="265"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="336"/>
         <source>Downloaded dives</source>
         <translation>Nerladdade dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="275"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="337"/>
         <source>Select all</source>
         <translation>Markera alla</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="282"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="282"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="282"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="282"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="338"/>
         <source>Unselect all</source>
         <translation>Avmarkera alla</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="323"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="339"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="291"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="296"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="340"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
         <source>Dive Computer</source>
         <translation>Dykdator</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="22"/>
         <source>Bluetooth is not enabled</source>
         <translation>Bluetooth är inte aktiverat</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/>
         <source> Vendor name: </source>
         <translation>Tillverkarnamn:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="97"/>
         <source>USB device</source>
         <translation>USB-enhet</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="105"/>
         <source> Dive Computer:</source>
         <translation>Dykdator:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="145"/>
         <source> Connection:</source>
         <translation>Anslutning:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/>
         <source> Previously used dive computers: </source>
         <translation>Tidigare använda dykdatorer</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="279"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/>
         <source>Retry</source>
         <translation>Försök igen</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="291"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="296"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <source>Quit</source>
         <translation>Avsluta</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="310"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="316"/>
         <source>Rescan</source>
         <translation>Ny sökning</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="321"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="314"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="319"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="319"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="325"/>
         <source> Downloaded dives</source>
         <translation>Nerladdade dyk</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="322"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="320"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="326"/>
         <source>Info:</source>
         <translation>Info:</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="345"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="349"/>
         <source>force downloading all dives</source>
         <translation>Tvinga nedladdning av alla dyk</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="351"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="356"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="356"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="387"/>
         <source>Accept</source>
         <translation>Acceptera</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="376"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="376"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="407"/>
         <source>Select All</source>
         <translation>Markera alla</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/DownloadFromDiveComputer.qml" line="385"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="416"/>
         <source>Unselect All</source>
         <translation>Avmarkera alla</translation>
     </message>
@@ -8298,10 +5015,7 @@ Existerande dykplats</translation>
 <context>
     <name>DownloadThread</name>
     <message>
-        <location filename="../core/downloadfromdcthread.cpp" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/downloadfromdcthread.cpp" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/downloadfromdcthread.cpp" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/downloadfromdcthread.cpp" line="99"/>
+        <location filename="../core/downloadfromdcthread.cpp" line="102"/>
         <source>No new dives downloaded from dive computer</source>
         <translation>Inga nya dyk att ladda ner från dykdator</translation>
     </message>
@@ -8309,7 +5023,7 @@ Existerande dykplats</translation>
 <context>
     <name>EditBuddies</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="607"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="638"/>
         <source>buddies</source>
         <translation>parkamrater</translation>
     </message>
@@ -8317,7 +5031,7 @@ Existerande dykplats</translation>
 <context>
     <name>EditDiveMaster</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="630"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="661"/>
         <source>dive master</source>
         <translation>dive master</translation>
     </message>
@@ -8325,15 +5039,23 @@ Existerande dykplats</translation>
 <context>
     <name>EditMode</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="442"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="454"/>
         <source>dive mode</source>
         <translation>dykläge</translation>
     </message>
 </context>
 <context>
+    <name>EditNumber</name>
+    <message>
+        <location filename="../desktop-widgets/command_edit.cpp" line="475"/>
+        <source>number</source>
+        <translation>nummer</translation>
+    </message>
+</context>
+<context>
     <name>EditTags</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="575"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="606"/>
         <source>tags</source>
         <translation>taggar</translation>
     </message>
@@ -8341,7 +5063,7 @@ Existerande dykplats</translation>
 <context>
     <name>EditTagsBase</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="513"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="547"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation><numerusform>Redigera %1 (%n dyk)</numerusform><numerusform>Redigera %1 (%n dyk)</numerusform></translation>
@@ -8351,146 +5073,38 @@ Existerande dykplats</translation>
     <name>ExtraDataModel</name>
     <message>
         <location filename="../qt-models/divecomputerextradatamodel.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divecomputerextradatamodel.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divecomputerextradatamodel.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divecomputerextradatamodel.cpp" line="11"/>
         <source>Key</source>
         <translation>Nyckel</translation>
     </message>
     <message>
         <location filename="../qt-models/divecomputerextradatamodel.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divecomputerextradatamodel.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divecomputerextradatamodel.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divecomputerextradatamodel.cpp" line="11"/>
         <source>Value</source>
         <translation>Värde</translation>
     </message>
 </context>
 <context>
-    <name>FacebookConnectWidget</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="14"/>
-        <source>Preferences</source>
-        <translation>Inställningar</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="82"/>
-        <source>Connect to Facebook text placeholder</source>
-        <translation>Anslut till Facebook </translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/>
-        <source>To disconnect Subsurface from your Facebook account, use the &apos;Share on&apos; menu entry.</source>
-        <translation>För att ta bort kopplingen mellan Subsurface och ditt konto på Facebook, använd &apos;Dela via&apos; menyn.</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/>
-        <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
-        <translation>Logga in för att koppla Subsurface till Facebook. Det möjliggör för Subsurface att publicera dyk till din tidslinje.</translation>
-    </message>
-</context>
-<context>
-    <name>FacebookManager</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/>
-        <source>Facebook logged in successfully</source>
-        <translation>Inloggning till Facebook lyckades</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="191"/>
-        <source>Error, unknown user id, cannot login.</source>
-        <translation>Fel, okänt användar-ID, kan inte logga in.</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
-        <source>Dive uploaded successfully to Facebook</source>
-        <translation>Dyk publicerades till Facebook</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="291"/>
-        <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source>
-        <translation>Uppladdning av dykdata misslyckades. Vänligen se debug-information och skicka resultatet till sändlistan för Subsurface</translation>
-    </message>
-</context>
-<context>
-    <name>FacebookPlugin</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebook_integration.cpp" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebook_integration.cpp" line="35"/>
-        <source>Facebook</source>
-        <translation>Facebook</translation>
-    </message>
-</context>
-<context>
-    <name>FilterBase</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="562"/>
-        <source>Select All</source>
-        <translation>Markera alla</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="563"/>
-        <source>Unselect All</source>
-        <translation>Avmarkera alla</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="564"/>
-        <source>Invert Selection</source>
-        <translation>Invertera markering</translation>
-    </message>
-</context>
-<context>
     <name>FilterWidget</name>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/listfilter.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/listfilter.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/listfilter.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="82"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/listfilter.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/listfilter.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/listfilter.ui" line="40"/>
         <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="83"/>
         <source>Text label</source>
         <translation>Text märke</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/listfilter.ui" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/listfilter.ui" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/listfilter.ui" line="50"/>
         <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="84"/>
         <source>Filter this list</source>
         <translation>Filtrera denna lista</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/listfilter.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/listfilter.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/listfilter.ui" line="57"/>
         <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="86"/>
         <source>Negate filter</source>
         <translation>Rensa filter</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/listfilter.ui" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/listfilter.ui" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/listfilter.ui" line="60"/>
         <location filename="../subsurface/desktop-widgets/ui_listfilter.h" line="88"/>
         <source>¬</source>
         <translation>¬</translation>
@@ -8504,148 +5118,143 @@ Existerande dykplats</translation>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="20"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="41"/>
         <source>Reset / close</source>
         <translation>Återställ / stäng</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="30"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="75"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="51"/>
         <location filename="../desktop-widgets/filterwidget2.ui" line="96"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="113"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="117"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="134"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="37"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="58"/>
         <source>People</source>
         <translation>Personer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="44"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="68"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="120"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="162"/>
+        <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"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="51"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="72"/>
         <source>Rating</source>
         <translation>Betyg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="58"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="79"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="82"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="103"/>
         <source>From</source>
         <translation>Från</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="89"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="110"/>
         <source>To</source>
         <translation>Till</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="106"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="127"/>
         <source>Visibility</source>
         <translation>Sikt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="136"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="157"/>
         <source>Equipment</source>
         <translation>Utrustning</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="152"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="173"/>
         <source>Water Temp</source>
         <translation>Vattentemperatur</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="169"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="190"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="176"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="197"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="183"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="204"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="190"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="211"/>
         <source>Air Temp</source>
         <translation>Lufttemp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="249"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="270"/>
         <source>Logged</source>
         <translation>Loggat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="259"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="280"/>
         <source>Planned</source>
         <translation>Planerat</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/filterwidget.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/filterwidget.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/filterwidget.ui" line="73"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="310"/>
+        <source>Close filters</source>
+        <translation>Stäng filtrering</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>Återställ filter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="318"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="337"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="356"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="375"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="394"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="413"/>
+        <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>Alla med</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="323"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="342"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="361"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="380"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="399"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="418"/>
+        <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>Innehåller</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="328"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="347"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="366"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="385"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="404"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="423"/>
+        <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>Innehåller inte</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/filterwidget.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/filterwidget.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/filterwidget.ui" line="87"/>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="121"/>
         <source>Show/hide filters</source>
         <translation>Visa/dölj filter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="289"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/filterwidget.ui" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/filterwidget.ui" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/filterwidget.ui" line="101"/>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="124"/>
         <source>Close and reset filters</source>
         <translation>Stäng och återställ filter</translation>
@@ -8665,98 +5274,62 @@ Existerande dykplats</translation>
     <name>FindMovedImagesDialog</name>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.ui" line="23"/>
         <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="154"/>
         <source>Find moved media files</source>
         <translation>Sök efter flyttade mediafiler</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.ui" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.ui" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.ui" line="37"/>
         <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="155"/>
         <source>Found media files</source>
         <translation>Sök efter mediafiler</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.ui" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.ui" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.ui" line="71"/>
         <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="157"/>
         <source>Match only media files in selected dive(s)</source>
         <translation>Matcha endast mediafiler i markerade dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.ui" line="95"/>
         <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="159"/>
         <source>Scanning:</source>
         <translation>Söker:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.ui" line="121"/>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="240"/>
         <location filename="../subsurface/desktop-widgets/ui_findmovedimagesdialog.h" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="240"/>
         <source>Select folder and scan</source>
         <translation>Välj katalog och påbörja sökning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="173"/>
         <source>Traverse media directories</source>
         <translation>Gå igenom mappar med media</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="179"/>
         <source>Stop scanning</source>
         <translation>Avbryt sökning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="250"/>
         <source>Scanning cancelled - results may be incomplete</source>
         <translation>Sökning avbruten - resultatet kan vara ofullständigt</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="254"/>
         <source>No matching media files found</source>
         <translation>Inga matchande mediafiler hittades</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="266"/>
         <source>Found &lt;b&gt;%1&lt;/b&gt; media files at their current place.</source>
         <translation>Hittade &lt;b&gt;%1&lt;/b&gt; mediafil(er) på sin nuvarande plats.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/findmovedimagesdialog.cpp" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/findmovedimagesdialog.cpp" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/findmovedimagesdialog.cpp" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/findmovedimagesdialog.cpp" line="268"/>
         <source>Found &lt;b&gt;%1&lt;/b&gt; media files at new locations:</source>
         <translation>Hittade &lt;b&gt;%1&lt;/b&gt; mediafil(er) på ny plats:</translation>
     </message>
@@ -8764,18 +5337,12 @@ Existerande dykplats</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2225"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2225"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2225"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2225"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2227"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2230"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2230"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2230"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2230"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2232"/>
         <source>Firmware update failed!</source>
         <translation>Misslyckades med att uppdatera enhetens firmware!</translation>
     </message>
@@ -8791,10 +5358,7 @@ Existerande dykplats</translation>
 <context>
     <name>GasSelectionModel</name>
     <message>
-        <location filename="../qt-models/models.cpp" line="38"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/models.cpp" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/models.cpp" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/models.cpp" line="52"/>
+        <location filename="../qt-models/models.cpp" line="39"/>
         <source>cyl.</source>
         <translation>flaska</translation>
     </message>
@@ -8811,41 +5375,26 @@ Existerande dykplats</translation>
     <name>GpsList</name>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/GpsList.qml" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/GpsList.qml" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/GpsList.qml" line="14"/>
         <source>GPS Fixes</source>
         <translation>GPS-position</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/GpsList.qml" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/GpsList.qml" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/GpsList.qml" line="30"/>
         <source>Date: </source>
         <translation>Datum:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/GpsList.qml" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/GpsList.qml" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
         <translation>Namn:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/GpsList.qml" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/GpsList.qml" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/GpsList.qml" line="54"/>
         <source>Latitude: </source>
         <translation>Latitud:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/GpsList.qml" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/GpsList.qml" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/GpsList.qml" line="65"/>
         <source>Longitude: </source>
         <translation>Longitud:</translation>
     </message>
@@ -8853,10 +5402,7 @@ Existerande dykplats</translation>
 <context>
     <name>GpsLocation</name>
     <message>
-        <location filename="../core/gpslocation.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/gpslocation.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/gpslocation.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/gpslocation.cpp" line="131"/>
+        <location filename="../core/gpslocation.cpp" line="134"/>
         <source>Unknown GPS location (no GPS source)</source>
         <translation>Okänd GPS-position (ingen GPS-information)</translation>
     </message>
@@ -8865,17 +5411,11 @@ Existerande dykplats</translation>
     <name>KMessageWidget</name>
     <message>
         <location filename="../desktop-widgets/kmessagewidget.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/kmessagewidget.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/kmessagewidget.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/kmessagewidget.cpp" line="92"/>
         <source>&amp;Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/kmessagewidget.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/kmessagewidget.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/kmessagewidget.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/kmessagewidget.cpp" line="93"/>
         <source>Close message</source>
         <translation>Stäng meddelande</translation>
     </message>
@@ -8909,137 +5449,78 @@ Existerande dykplats</translation>
     </message>
 </context>
 <context>
-    <name>LocationFilter</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="548"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="548"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="593"/>
-        <source>Location</source>
-        <translation>Plats</translation>
-    </message>
-</context>
-<context>
     <name>LocationFilterDelegate</name>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/modeldelegates.cpp" line="491"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/modeldelegates.cpp" line="491"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/modeldelegates.cpp" line="491"/>
         <source> (same GPS fix)</source>
         <translation>(samma GPS position)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/modeldelegates.cpp" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/modeldelegates.cpp" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/modeldelegates.cpp" line="496"/>
         <source> (~%1 away</source>
         <translation>(~%1 bort</translation>
     </message>
     <message numerus="yes">
         <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/modeldelegates.cpp" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/modeldelegates.cpp" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/modeldelegates.cpp" line="497"/>
         <source>, %n dive(s) here)</source>
         <translation><numerusform>, %n dyka här)</numerusform><numerusform>, %n dyk här)</numerusform></translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="509"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/modeldelegates.cpp" line="502"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/modeldelegates.cpp" line="502"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/modeldelegates.cpp" line="502"/>
         <source>(no existing GPS data, add GPS fix from this dive)</source>
         <translation>(ingen existerade GPS-data, lägg till en GPS-position för detta dyk)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="511"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/modeldelegates.cpp" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/modeldelegates.cpp" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/modeldelegates.cpp" line="504"/>
         <source>(no GPS data)</source>
         <translation>(ingen GPS-data)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="513"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/modeldelegates.cpp" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/modeldelegates.cpp" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/modeldelegates.cpp" line="506"/>
         <source>Pick site: </source>
         <translation>Välj plats:</translation>
     </message>
 </context>
 <context>
-    <name>LocationFilterModel</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/filtermodels.cpp" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/filtermodels.cpp" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/filtermodels.cpp" line="547"/>
-        <source>No location set</source>
-        <translation>Ingen plats angiven</translation>
-    </message>
-</context>
-<context>
     <name>LocationInformation</name>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="189"/>
         <source>GroupBox</source>
         <translation>GruppLåda</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="29"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="191"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="36"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="192"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="43"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="193"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="53"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="194"/>
         <source>Coordinates</source>
         <translation>Koordinater</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="73"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="196"/>
         <source>Reverse geo lookup</source>
         <translation>Bakåtuppslagning av geografisk information</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="76"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="198"/>
         <source>...</source>
         <translation>...</translation>
@@ -9055,35 +5536,23 @@ Existerande dykplats</translation>
         <translation>Visa dykplatser inom räckvidd av:</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="97"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="199"/>
         <source>Dive sites on same coordinates</source>
         <translation>Dykplatser med samma koordinater</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="138"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="200"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.ui" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="152"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="202"/>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationInformation.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationInformation.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationInformation.ui" line="162"/>
         <location filename="../subsurface/desktop-widgets/ui_locationInformation.h" line="204"/>
         <source>Update location on map</source>
         <translation>Uppdatera position på karta</translation>
@@ -9120,74 +5589,25 @@ Existerande dykplats</translation>
 <context>
     <name>LocationInformationWidget</name>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="26"/>
-        <source>Apply changes</source>
-        <translation>Spara förändringar</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="29"/>
-        <source>Discard changes</source>
-        <translation>Ångra förändringar</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/locationinformation.cpp" line="29"/>
         <source>Done</source>
         <translation>Klar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.cpp" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="259"/>
         <source>Dive site management</source>
         <translation>Redigera dykplats</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="56"/>
         <source>Merge into current site</source>
         <translation>Sammanfoga med nuvarande plats</translation>
     </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="75"/>
-        <source>Merging dive sites</source>
-        <translation>Sammanslår dykplatser</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="76"/>
-        <source>You are about to merge dive sites, you can't undo that action 
- Are you sure you want to continue?</source>
-        <translation>Du är påväg att slå samman dykplatser, du kan inte ångra ihopslagningen
-Är du säker på att du vill fortsätta?</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/locationinformation.cpp" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/locationinformation.cpp" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/locationinformation.cpp" line="271"/>
-        <source>You are editing a dive site</source>
-        <translation>Du redigerar en dykplats</translation>
-    </message>
 </context>
 <context>
     <name>Log</name>
     <message>
         <location filename="../mobile-widgets/qml/Log.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Log.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Log.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Log.qml" line="15"/>
         <source>Application Log</source>
         <translation>Applikationslogg</translation>
     </message>
@@ -9196,97 +5616,55 @@ Existerande dykplats</translation>
     <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="30"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="454"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="444"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="444"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="444"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="544"/>
+        <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="../subsurface/desktop-widgets/ui_maintab.h" line="511"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="512"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="536"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="536"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="536"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="491"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="87"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="97"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="494"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="107"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="226"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="224"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="288"/>
         <source>Air temp.</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="117"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="227"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="225"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="289"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="289"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="289"/>
         <source>Water temp.</source>
         <translation>Vattentemp.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="192"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="543"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="535"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="222"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="501"/>
         <source>Edit dive site</source>
         <translation>Redigera dykplats</translation>
@@ -9294,80 +5672,52 @@ Existerande dykplats</translation>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="225"/>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="235"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="225"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="225"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="225"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="257"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="504"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="277"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="267"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="505"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="313"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="313"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="313"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="506"/>
         <source>Rating</source>
         <translation>Betyg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="326"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="326"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="326"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="507"/>
         <source>Visibility</source>
         <translation>Sikt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="333"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="402"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="392"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="392"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="392"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="398"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="509"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="402"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="402"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="402"/>
+        <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>Dykläge</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="496"/>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="513"/>
         <source>Equipment</source>
@@ -9375,51 +5725,33 @@ Existerande dykplats</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="164"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="164"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="164"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="497"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.ui" line="80"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="492"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
         <source>Extra Info</source>
         <translation>Extra Info</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="57"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="59"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
         <source>Media</source>
         <translation>Media</translation>
     </message>
@@ -9429,136 +5761,68 @@ Existerande dykplats</translation>
         <translation>Dykplatser</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="85"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="90"/>
         <source>Apply changes</source>
         <translation>Spara förändringar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="89"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="94"/>
         <source>Discard changes</source>
         <translation>Ångra förändringar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/>
         <source>Undo</source>
         <translation>Ångra</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="731"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="735"/>
         <source>Warning: edited %1 dives</source>
         <translation>Varning: redigerade %1 dyk</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="105"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="105"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="105"/>
-        <source>Cylinders</source>
-        <translation>Flaskor</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="106"/>
-        <source>Add cylinder</source>
-        <translation>Lägg till flaska</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="109"/>
-        <source>Weights</source>
-        <translation>Vikter</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="110"/>
-        <source>Add weight system</source>
-        <translation>Lägg till viktsystem</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="223"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="285"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="285"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="285"/>
+        <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="224"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="286"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="286"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="286"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="222"/>
         <source>Water temp. [%1]</source>
         <translation>Vattentemp. [%1]</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="329"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="329"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="329"/>
-        <source>This trip is being edited.</source>
-        <translation>Denna resa håller på att ändras.</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="336"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="260"/>
         <source>Multiple dives are being edited.</source>
         <translation>Flera dyk håller på att ändras.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="338"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="262"/>
         <source>This dive is being edited.</source>
         <translation>Detta dyk håller på att ändras.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="452"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="492"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="483"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="458"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/>
         <source>Trip notes</source>
         <translation>Reseanteckningar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="487"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="478"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="478"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="478"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="491"/>
         <source>Trip location</source>
         <translation>Resmål</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="686"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="982"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="982"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="980"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="690"/>
         <source>Discard the changes?</source>
         <translation>Ta bort förändringar?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="687"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/maintab.cpp" line="983"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/maintab.cpp" line="983"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/maintab.cpp" line="981"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="691"/>
         <source>You are about to discard your changes.</source>
         <translation>Du är påväg att ta bort dina förändringar.</translation>
     </message>
@@ -9567,362 +5831,240 @@ Existerande dykplats</translation>
     <name>MainWindow</name>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="614"/>
         <source>&amp;File</source>
         <translation>&amp;Arkiv</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="82"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="615"/>
         <source>&amp;Log</source>
         <translation>&amp;Logg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="98"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="616"/>
         <source>&amp;View</source>
         <translation>&amp;Visa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="114"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="617"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjälp</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="123"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="618"/>
         <source>&amp;Import</source>
         <translation>&amp;Importera</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="131"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="619"/>
         <source>&amp;Edit</source>
         <translation>&amp;Redigera</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="136"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="620"/>
         <source>Share on</source>
         <translation>Dela via</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="143"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="529"/>
         <source>&amp;New logbook</source>
         <translation>&amp;Ny Loggbok</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="146"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="531"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="154"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="533"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;Öppna loggbok</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="157"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="570"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="570"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="506"/>
         <source>Open</source>
         <translation>Öppna</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="165"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="537"/>
         <source>&amp;Save</source>
         <translation>&amp;Spara</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="168"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="539"/>
         <source>Save</source>
         <translation>Spara</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="176"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="541"/>
         <source>Sa&amp;ve as</source>
         <translation>Spara som(&amp;v)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="179"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="543"/>
         <source>Save as</source>
         <translation>Spara som</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="187"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="545"/>
         <source>&amp;Close</source>
         <translation>&amp;Stäng</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="190"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="547"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="198"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="549"/>
         <source>&amp;Print</source>
         <translation>&amp;Skriv ut</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="206"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="550"/>
         <source>P&amp;references</source>
         <translation>Inställninga&amp;r</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="217"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="551"/>
         <source>&amp;Quit</source>
         <translation>&amp;Avsluta</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="235"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="228"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="552"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importera från &amp;dykdator</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="236"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="553"/>
         <source>Edit device &amp;names</source>
         <translation>Ändra enhetsn&amp;amn</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="241"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="554"/>
         <source>&amp;Add dive</source>
         <translation>Lägg till dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="249"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="555"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Kopiera dykinformation</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="257"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="556"/>
         <source>&amp;Paste dive components</source>
         <translation>Klistra in dykinformation</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="272"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="265"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="557"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Uppdatera numrering</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="276"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="558"/>
         <source>Auto &amp;group</source>
         <translation>Autogruppering</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="281"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="559"/>
         <source>&amp;Yearly statistics</source>
         <translation>&amp;Årsstatistik</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="289"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="560"/>
         <source>&amp;Dive list</source>
         <translation>Dyklista</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="304"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="297"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="561"/>
         <source>&amp;Profile</source>
         <translation>&amp;Profil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="305"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="562"/>
         <source>&amp;Info</source>
         <translation>&amp;Info</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="320"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="313"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="563"/>
         <source>&amp;All</source>
         <translation>&amp;Alla</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="321"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="564"/>
         <source>P&amp;revious DC</source>
         <translation>Fö&amp;regående dykdator</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="329"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="565"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Nästa dykdator</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="337"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="566"/>
         <source>&amp;About Subsurface</source>
         <translation>Om Subsurface(&amp;a)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="352"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="345"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="567"/>
         <source>User &amp;manual</source>
         <translation>Användar&amp;manual</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="353"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="568"/>
         <source>&amp;Map</source>
         <translation>&amp;Karta</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="368"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="368"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="368"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="361"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="569"/>
         <source>P&amp;lan dive</source>
         <translation>P&amp;lanera dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="376"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="369"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="570"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Importera från loggfil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="372"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="572"/>
         <source>Import divelog files from other applications</source>
         <translation>Importera dykloggfiler från andra applikationer</translation>
@@ -9939,54 +6081,36 @@ Existerande dykplats</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="398"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="387"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="387"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="380"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="574"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importera &amp;från divelogs.de</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="388"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="575"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Helskärmsläge</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="398"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="398"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="391"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="577"/>
         <source>Toggle full screen</source>
         <translation>Växla helskärmsläge</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="399"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="579"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Sök efter uppdateringar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="404"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="580"/>
         <source>&amp;Export</source>
         <translation>&amp;Exportera</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="425"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="407"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="582"/>
         <source>Export dive logs</source>
         <translation>Exportera dykloggar</translation>
@@ -10003,171 +6127,114 @@ Existerande dykplats</translation>
         <translation>Växla deko-information</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="415"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="584"/>
         <source>Configure &amp;dive computer</source>
         <translation>Konfigurera &amp;dykdator</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="444"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="426"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="585"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Redigera &amp;dykplan</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="456"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="438"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="586"/>
         <source>Toggle pO₂ graph</source>
         <translation>Slå på/av pO₂ graf</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="468"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="457"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="457"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="450"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="587"/>
         <source>Toggle pN₂ graph</source>
         <translation>Slå på/av pN₂ graf</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="480"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="469"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="469"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="462"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="588"/>
         <source>Toggle pHe graph</source>
         <translation>Slå på/av pHe graf</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="492"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="481"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="481"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="474"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="589"/>
         <source>Toggle DC reported ceiling</source>
         <translation>Slå på/av rapporterat takdjup från dykdator</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="493"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="493"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="486"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="590"/>
         <source>Toggle calculated ceiling</source>
         <translation>Slå på/av beräknat takdjup</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="505"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="505"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="498"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="591"/>
         <source>Toggle calculating all tissues</source>
         <translation>Slå på/av beräkningen av vävnader</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="528"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="510"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="592"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation>Slå av/på beräknat takdjup i 3m inkrement</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="540"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="529"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="529"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="522"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="593"/>
         <source>Toggle heart rate</source>
         <translation>Slå på/av hjärtrytm</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="534"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="594"/>
         <source>Toggle MOD</source>
         <translation>Slå på/av MOD (Maximum Operating Depth)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="546"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="595"/>
         <source>Toggle EAD, END, EADD</source>
         <translation>Slå på/av EAD, END, EADD</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="576"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="565"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="565"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="558"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="596"/>
         <source>Toggle NDL, TTS</source>
         <translation>Slå på/av NDL, TTS</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="588"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="577"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="577"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="570"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="597"/>
         <source>Toggle SAC rate</source>
         <translation>Slå på/av SAC (Surface Consumtion Rate)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="600"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="589"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="589"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="582"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="598"/>
         <source>Toggle ruler</source>
         <translation>Slå på/av mätverktyget</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="612"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="601"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="601"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="594"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="599"/>
         <source>Scale graph</source>
         <translation>Skala graf</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="624"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="613"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="613"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="606"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="600"/>
         <source>Toggle media</source>
         <translation>Slå på/av media</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="674"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="674"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="667"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="607"/>
         <source>&amp;Find moved media files</source>
         <translation>&amp;Sök efter flyttade mediafiler</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="625"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="625"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="618"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="601"/>
         <source>Toggle gas bar</source>
         <translation>Slå på/av graf för gas</translation>
@@ -10179,199 +6246,108 @@ Existerande dykplats</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="644"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="633"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="633"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="626"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="602"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Filtrera dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="659"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="648"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="648"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="641"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="603"/>
         <source>Toggle tissue heat-map</source>
         <translation>Slå på/av färgdiagram för vävnader</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="664"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="653"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="653"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="646"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="604"/>
         <source>User &amp;survey</source>
         <translation>&amp;Användarundersökning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="669"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="658"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="658"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="651"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="605"/>
         <source>&amp;Undo</source>
         <translation>&amp;Ångra</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="666"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="666"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="659"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="606"/>
         <source>&amp;Redo</source>
         <translation>&amp;Gör om</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="690"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="679"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="679"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="672"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="608"/>
         <source>Open c&amp;loud storage</source>
         <translation>Öppna molnlagring</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="677"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="609"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>Spara till molnlagring</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="700"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="689"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="682"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="610"/>
         <source>&amp;Manage dive sites</source>
         <translation>&amp;Hantera dykplatser</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="705"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="694"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="694"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="687"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="611"/>
         <source>Dive Site &amp;Edit</source>
         <translation>Dykplats redigering</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="699"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="612"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.ui" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.ui" line="707"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.ui" line="695"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="613"/>
         <source>Cloud storage online</source>
         <translation>Molnlagring uppkopplad</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="421"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="421"/>
-        <source>Connect to</source>
-        <translation>Anslut till</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="415"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="415"/>
-        <source>Disconnect from</source>
-        <translation>Kopplan ner från</translation>
-    </message>
-    <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="483"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="530"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1516"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="561"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="606"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1571"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="561"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="606"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1571"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1507"/>
+        <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>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker öppna en ny fil.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="489"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="567"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="567"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="503"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
         <source>Open file</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1913"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="571"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="571"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="507"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1886"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="685"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="604"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="653"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="803"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="911"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1787"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="655"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="672"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="719"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="864"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="973"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1811"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="655"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="672"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="719"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="864"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="973"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1811"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="655"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="608"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="655"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="800"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="909"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1747"/>
+        <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"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="686"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/divelistview.cpp" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/divelistview.cpp" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/divelistview.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="693"/>
         <source>Trying to merge dives with %1min interval in between</source>
         <translation>Försöker slå ihop dyk med %1 min ytintervall mellan varandra </translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="278"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="278"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="271"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
         <source>Template backup created</source>
         <translation>Backupkopia av mall skapad</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="279"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="279"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="272"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="258"/>
         <source>The following backup printing templates were created:
 
 %1
@@ -10394,399 +6370,231 @@ skrivskyddade och inte ska redigeras direkt, det är möjligt att applikationen
 skriver över utskriftsmallen vid start.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="604"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="672"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="672"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="608"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="607"/>
         <source>Please save or cancel the current dive edit before going online</source>
         <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du går online.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="617"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="685"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="621"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="620"/>
         <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>Du har ändringar som inte har sparats. Vill du skicka ändringar till platsen för molnlagring?
 Om du svarar Nej kommer förändringarna synkroniseras nästa gång du väljer &quot;Öppna molnlagring&quot; eller &quot;Spara till molnlagring&quot;.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="627"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="631"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="630"/>
         <source>Failure taking cloud storage online</source>
         <translation>Misslyckades med att aktivera molnlagringstjänsten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="700"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="760"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="760"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="696"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="703"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du stänger filen.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="803"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="864"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="864"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="800"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="806"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker lägga till ett dyk.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="855"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="916"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="916"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="852"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="858"/>
         <source>Print runtime table</source>
         <translation>Skriv ut dyktidstabell</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="911"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="973"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="973"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="909"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="914"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Försöker planera om ett dyk som inte har en dykplan.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1671"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1774"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>multiple files</source>
         <translation>flera filer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1752"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1766"/>
         <source>Open dive site file</source>
         <translation>Öppna dykplatsfil</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1787"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1811"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1811"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1747"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Först avsluta den aktuella ändringen innan du försöker göra en annan.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1018"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1085"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1085"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1021"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1017"/>
         <source>Yearly statistics</source>
         <translation>Årsstatistik</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1245"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1286"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1312"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1353"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1312"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1353"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1248"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1289"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/>
         <source>Dive log files</source>
         <translation>dykloggfiler</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="1545"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1332"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1374"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1600"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1332"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1374"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1600"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1268"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1310"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1536"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1559"/>
         <source>Subsurface files</source>
         <translation>Subsurface filer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1333"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1375"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1333"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1375"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1269"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1311"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
         <source>Cochran</source>
         <translation>Cochran</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1334"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1377"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1334"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1377"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1270"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1313"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
         <source>DiveLogs.de</source>
         <translation>DiveLogs.de</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1335"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1378"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1335"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1378"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1271"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1314"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
         <source>JDiveLog</source>
         <translation>JDiveLog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1336"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1379"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1336"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1379"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1272"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1315"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
         <source>Liquivision</source>
         <translation>Liquivision</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1337"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1380"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1337"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1380"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1273"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1316"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
         <source>Suunto</source>
         <translation>Suunto</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1338"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1381"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1338"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1381"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1274"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1317"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
         <source>UDCF</source>
         <translation>UDCF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1339"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1382"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1339"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1382"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1275"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1318"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
         <source>UDDF</source>
         <translation>UDDF</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1340"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1383"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1340"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1383"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1276"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1319"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
         <source>XML</source>
         <translation>XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1341"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1384"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1341"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1384"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1277"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1320"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
         <source>Divesoft</source>
         <translation>Divesoft</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1342"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1385"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1342"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1385"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1278"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1321"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
         <source>Datatrak/WLog</source>
         <translation>Datatrak/WLog</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1276"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1343"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1386"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1343"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1386"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1279"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1322"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
         <source>MkVI files</source>
         <translation>MkVI filer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1344"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1387"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1344"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1387"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1280"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1323"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1276"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
         <source>APD log viewer</source>
         <translation>APD loggvisare</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1345"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1388"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1345"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1388"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1281"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1324"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
         <source>OSTCtools</source>
         <translation>OSTCtools</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1279"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1346"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1389"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1346"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1389"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1282"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1325"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
         <source>DAN DL7</source>
         <translation>DAN DL7</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1376"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1376"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1312"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
         <source>CSV</source>
         <translation>CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1390"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1390"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1326"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/>
         <source>All files</source>
         <translation>Alla filer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1330"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/>
         <source>Dive site files</source>
         <translation>Dykplatsfiler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1400"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1400"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1336"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Vill du spara ändringarna som du gjort i filen %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1346"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1401"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1401"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1337"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Vill du spara ändringarna som du gjort i filen?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="616"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1406"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1406"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="620"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1342"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
         <source>Save changes?</source>
         <translation>Spara ändringar?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1407"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1407"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1343"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Ändringar förloras om du inte sparar dom.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1544"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1599"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1599"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1535"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1558"/>
         <source>Save file as</source>
         <translation>Spara fil som</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1632"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1687"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1687"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1623"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1646"/>
         <source>[local cache for] %1</source>
         <translation>[lokal cache för] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1688"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1688"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1624"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1647"/>
         <source>[cloud storage for] %1</source>
         <translation>[molnlagring för] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1700"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1755"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1755"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1691"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/>
         <source>Opening datafile from older version</source>
         <translation>Öppnar datafil från en äldre version</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1701"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1756"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1756"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1692"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/>
         <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>Du öppnade en datafil från en äldre version av Subsurface. Vi rekommenderar att du läser manualen för att ta del av förändringarna i den nya versionen, det är framför allt redigering av dykplatser som har genomgått signifikanta förändringar.
 Subsurface har redan försökt att fylla i data korrekt men kontrollera dina dykplatser och se till att allt ser bra ut.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1725"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1780"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1780"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1716"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1739"/>
         <source>Open dive log file</source>
         <translation>Öppna dyklogg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1913"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="1950"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="1886"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Contacting cloud service...</source>
         <translation>Kontaktar molnlagringstjänst...</translation>
     </message>
@@ -10795,9 +6603,6 @@ Subsurface har redan försökt att fylla i data korrekt men kontrollera dina dyk
     <name>MapPage</name>
     <message>
         <location filename="../mobile-widgets/qml/MapPage.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/MapPage.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/MapPage.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/MapPage.qml" line="10"/>
         <source>Map</source>
         <translation>Karta</translation>
     </message>
@@ -10806,9 +6611,6 @@ Subsurface har redan försökt att fylla i data korrekt men kontrollera dina dyk
     <name>MapWidget</name>
     <message>
         <location filename="../map-widget/qml/MapWidget.qml" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/map-widget/qml/MapWidget.qml" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/map-widget/qml/MapWidget.qml" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/map-widget/qml/MapWidget.qml" line="255"/>
         <source>Drag the selected dive location</source>
         <translation>Dra den valda dykplatsen</translation>
     </message>
@@ -10817,33 +6619,21 @@ Subsurface har redan försökt att fylla i data korrekt men kontrollera dina dyk
     <name>MapWidgetContextMenu</name>
     <message>
         <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/map-widget/qml/MapWidgetContextMenu.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.5/map-widget/qml/MapWidgetContextMenu.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.6/map-widget/qml/MapWidgetContextMenu.qml" line="15"/>
         <source>Open in Google Maps</source>
         <translation>Öppna i Google Maps</translation>
     </message>
     <message>
         <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.4/map-widget/qml/MapWidgetContextMenu.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/map-widget/qml/MapWidgetContextMenu.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/map-widget/qml/MapWidgetContextMenu.qml" line="16"/>
         <source>Copy coordinates to clipboard (decimal)</source>
         <translation>Kopiera koordinater till urklipp (decimal)</translation>
     </message>
     <message>
         <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/map-widget/qml/MapWidgetContextMenu.qml" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/map-widget/qml/MapWidgetContextMenu.qml" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/map-widget/qml/MapWidgetContextMenu.qml" line="17"/>
         <source>Copy coordinates to clipboard (sexagesimal)</source>
         <translation>Kopiera koordinater till urklipp (sexagesimal)</translation>
     </message>
     <message>
         <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/map-widget/qml/MapWidgetContextMenu.qml" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.5/map-widget/qml/MapWidgetContextMenu.qml" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.6/map-widget/qml/MapWidgetContextMenu.qml" line="18"/>
         <source>Select visible dive locations</source>
         <translation>Välj synliga dykplatser</translation>
     </message>
@@ -10852,9 +6642,6 @@ Subsurface har redan försökt att fylla i data korrekt men kontrollera dina dyk
     <name>MapWidgetError</name>
     <message>
         <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.4/map-widget/qml/MapWidgetError.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.5/map-widget/qml/MapWidgetError.qml" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.6/map-widget/qml/MapWidgetError.qml" line="10"/>
         <source>MapWidget.qml failed to load!
 The QML modules QtPositioning and QtLocation could be missing!</source>
         <translation>MapWidget.qml laddades inte!
@@ -10862,40 +6649,14 @@ QML modulerna för QtPositioning samt QtLocation kan saknas!</translation>
     </message>
 </context>
 <context>
-    <name>MergeDives</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="804"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="804"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="804"/>
-        <source>merge dive</source>
-        <translation>sammanfoga dyk</translation>
-    </message>
-</context>
-<context>
-    <name>MultiFilter</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="637"/>
-        <source>Filter shows %1 (of %2) dives</source>
-        <translation>Filter visar %1 (av %2) dyk</translation>
-    </message>
-</context>
-<context>
     <name>OstcFirmwareCheck</name>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Du borde uppdatera firmware i din dykdator: du har version %1 men den senaste stabila versionen är %2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="301"/>
         <source>
 
 If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source>
@@ -10905,41 +6666,26 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="302"/>
         <source>Not now</source>
         <translation>Inte nu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="303"/>
         <source>Update firmware</source>
         <translation>Uppdatera firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="305"/>
         <source>Firmware upgrade notice</source>
         <translation>Information firmware-uppdatering</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="323"/>
         <source>Save the downloaded firmware as</source>
         <translation>Spara nedladdad firmware som</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/configuredivecomputerdialog.cpp" line="324"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/configuredivecomputerdialog.cpp" line="324"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/configuredivecomputerdialog.cpp" line="324"/>
         <source>Firmware files</source>
         <translation>Firmware filer</translation>
     </message>
@@ -10971,7 +6717,7 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
 <context>
     <name>PasteDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="733"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="760"/>
         <source>Paste onto %n dive(s)</source>
         <translation><numerusform>Klistra in till %n dyk</numerusform><numerusform>Klistra in till %n dyk</numerusform></translation>
     </message>
@@ -10980,121 +6726,73 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     <name>PlannerSettingsWidget</name>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="544"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="544"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="544"/>
         <source>Last stop at 20ft</source>
         <translation>Sista stoppet på 20ft</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="562"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="545"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="545"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="545"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% av snittdjup till 20ft</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="563"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="546"/>
         <source>20ft to surface</source>
         <translation>20ft till ytan</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="547"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="550"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="550"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="550"/>
         <source>Last stop at 6m</source>
-        <translation>Sista stoppet på 6m</translation>
+        <translation>Sista stopp på 6m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="568"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="551"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="551"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="551"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% av snittdjup till 6m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="569"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="552"/>
         <source>6m to surface</source>
-        <translation>6m till ytan</translation>
+        <translation>Från 6m till ytan</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="570"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="556"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="557"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="556"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="557"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="556"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="557"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="582"/>
         <location filename="../desktop-widgets/diveplanner.cpp" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="565"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="565"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="565"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="566"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="575"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="575"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="575"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="597"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="580"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="580"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="580"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
@@ -11103,44 +6801,29 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     <name>PreferencesDefaults</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="329"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Listor och tabeller</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="29"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="331"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="39"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="332"/>
         <source>Font size</source>
         <translation>Fontstorlek</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="52"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="333"/>
         <source>Dives</source>
         <translation>Dyk</translation>
@@ -11152,54 +6835,36 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Förvald fil för dyklogg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="76"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="335"/>
         <source>&amp;No default file</source>
         <translation>&amp;Ingen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.6/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;Lokal</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Molnlagringstjänst</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Lokal dykloggfil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Använd standardvärden</translation>
@@ -11207,12 +6872,6 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -11220,141 +6879,103 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Visa ogiltiga dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Förvald flaska</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Använd standardflaska</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="179"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="345"/>
         <source>Animations</source>
         <translation>Animationer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.ui" line="188"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_defaults.h" line="346"/>
         <source>Speed</source>
         <translation>Hastighet</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Videominiatyrer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>exekverbar ffmpeg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="251"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="251"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="251"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Hämta vid position</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Extrahera videominiatyrer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Rensa inställningar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Rensa ihågkomna dykdatorer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.ui" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.ui" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Återställ alla värden till standardinställningar</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="14"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Open default log file</source>
         <translation>Öppna förvald dyklogg</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Subsurface files</source>
         <translation>Subsurface filer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
+        <source>Warning</source>
+        <translation>Varning</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>Kan inte exekvera ffmpeg från angiven plats. Skapa miniatyrer kommer inte fungera.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="70"/>
         <source>Select ffmpeg executable</source>
         <translation>Välj exekverbar ffmpeg</translation>
     </message>
@@ -11363,8 +6984,6 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     <name>PreferencesDialog</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferencesdialog.cpp" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferencesdialog.cpp" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferencesdialog.cpp" line="42"/>
         <source>Preferences</source>
         <translation>Inställningar</translation>
     </message>
@@ -11373,18 +6992,12 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     <name>PreferencesGeoreference</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_georeference.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_georeference.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_georeference.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_georeference.h" line="105"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_georeference.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_georeference.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Utformning av dykplats</translation>
@@ -11392,12 +7005,6 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     <message>
         <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="42"/>
         <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_georeference.ui" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_georeference.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_georeference.ui" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_georeference.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_georeference.ui" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_georeference.ui" line="59"/>
         <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>
@@ -11405,9 +7012,6 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_georeference.cpp" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_georeference.cpp" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_georeference.cpp" line="10"/>
         <source>Georeference</source>
         <translation>Georeferens</translation>
     </message>
@@ -11416,117 +7020,78 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     <name>PreferencesGraph</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="337"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="20"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="338"/>
         <source>Gas pressure display setup</source>
         <translation>Inställningar för visning av gastryck</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.6/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 inställningar:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="239"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="239"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="239"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Inställningar för visning av takdjup</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="314"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="314"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Rita takdjup rapporterad från dykdator i röd färg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Algoritm för beräknat takdjup:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="245"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="362"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="341"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="341"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="341"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="341"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="371"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.6/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 inställningar:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Utspädningsratio</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="215"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
         <translation>Tröskelvärde för pO₂ (minimum, maximum)</translation>
@@ -11538,24 +7103,6 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="98"/>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="121"/>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="145"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="340"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="341"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="343"/>
@@ -11567,117 +7114,78 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="65"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="342"/>
         <source>Threshold for pN₂ (maximum only)</source>
         <translation>Tröskelvärde för pN₂ (endast maximum)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="88"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="344"/>
         <source>Threshold for pHe (maximum only)</source>
         <translation>Tröskelvärde för pHe (endast maximum)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="111"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="346"/>
         <source>pO₂ in calculating MOD (maximum only )</source>
         <translation>pO₂ för beräkning av MOD (endast maximum)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
         <translation>Dykplanerarens standardsetpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="161"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="351"/>
         <source>Show O₂ sensor values when viewing pO₂</source>
         <translation>Visa sensorvärden för O₂ när pO₂ visas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="168"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="352"/>
         <source>Show CCR setpoints when viewing pO₂</source>
         <translation>Visa referensvärden för CCR när pO₂ visas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="182"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="182"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="182"/>
-        <location filename="../tmp/Subsurface-4.8.6/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 ämnesomsättning O₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
         <translation>Visa motsvarande OC pO₂ med pSCR pO₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="229"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="360"/>
         <source>Show warnings for isobaric counterdiffusion</source>
         <translation>Visa varningar för isobar motdiffusion (ICD)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="288"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Nivå av konservatism</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Skapa nya miniatyrer om de är äldre än mediafilen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="255"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="363"/>
         <source>B&amp;ühlmann</source>
         <translation>B&amp;ühlmann</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -11685,12 +7193,6 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="275"/>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="328"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="365"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="370"/>
         <source>%</source>
@@ -11698,45 +7200,30 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="321"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="321"/>
-        <location filename="../tmp/Subsurface-4.8.6/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="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.ui" line="354"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_graph.h" line="372"/>
         <source>Misc</source>
         <translation>Övrigt</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="360"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Visa oanvända flaskor i utrustningsfliken</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.ui" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.ui" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Visa medeldjup i profilen</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="12"/>
         <source>Profile</source>
         <translation>Profil</translation>
     </message>
@@ -11745,54 +7232,36 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     <name>PreferencesLanguage</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="178"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="26"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="179"/>
         <source>UI language</source>
         <translation>Språkinställningar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="32"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="180"/>
         <source>Use system default</source>
         <translation>Använd standardspråk för systemet</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="55"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="181"/>
         <source>Filter</source>
         <translation>Filter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="74"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="182"/>
         <source>Date format</source>
         <translation>Datumformat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.6/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;Föredraget datum format. Vanliga använda fält är&lt;/p&gt;&lt;p&gt;d (dag i månad)&lt;/p&gt;&lt;p&gt;ddd (förkortat dag namn)&lt;/p&gt;&lt;p&gt;M (månads nummer)&lt;/p&gt;&lt;p&gt;MMM (förkortat månads namn)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 siffrigt år)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -11800,12 +7269,6 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="80"/>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="138"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="183"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="192"/>
         <source>Use UI language default</source>
@@ -11813,69 +7276,45 @@ On din enhet använder Bluetooth, genomför samma förberedelser som vid nedladd
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="90"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="185"/>
         <source>This is used in places where there is less space to show the full date</source>
         <translation>Detta används på platser där det inte är tillräckligt med plats att visa fullständigt datum</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="93"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="187"/>
         <source>Short format</source>
         <translation>Kort format</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="132"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="191"/>
         <source>Time format</source>
         <translation>Tidsformat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.ui" line="151"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.ui" line="151"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.ui" line="151"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.ui" line="151"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_language.h" line="194"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred time format&lt;/p&gt;&lt;p&gt;Commonly used format specifiers are&lt;/p&gt;&lt;p&gt;h (hours in 12h format)&lt;/p&gt;&lt;p&gt;H (hours in 24h format)&lt;/p&gt;&lt;p&gt;mm (2 digit minutes)&lt;/p&gt;&lt;p&gt;ss (2 digit seconds)&lt;/p&gt;&lt;p&gt;t/tt (a/p or am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Föredraget datum format. Vanliga använda fält är&lt;/p&gt;&lt;p&gt;h (timmar i 12h format)&lt;/p&gt;&lt;p&gt;H (timmar i 24h format)&lt;/p&gt;&lt;p&gt;mm (2 siffriga minutes)&lt;/p&gt;&lt;p&gt;ss (2 siffriga seconds)&lt;/p&gt;&lt;p&gt;t/tt (a/p eller am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="13"/>
         <source>Language</source>
         <translation>Språk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="75"/>
         <source>Restart required</source>
         <translation>Omstart krävs</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="76"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>För att ändra till ett nytt språk måste Subsurface startas om.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="94"/>
         <source>These will be used as is. This might not be what you intended.
 See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
         <translation>Resultatet kanske inte blir som du har tänkt dig.
@@ -11884,20 +7323,11 @@ Se https://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="97"/>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="103"/>
         <source>Literal characters</source>
         <translation>Bokstavliga tecken</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="98"/>
         <source>Non-special character(s) in time format.
 </source>
         <translation>Ej giltiga specialtecken används i tidsformat.
@@ -11905,9 +7335,6 @@ Se https://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_language.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_language.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_language.cpp" line="104"/>
         <source>Non-special character(s) in date format.
 </source>
         <translation>Ej giltiga specialtecken används i datumformat.
@@ -11918,54 +7345,36 @@ Se https://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     <name>PreferencesNetwork</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="233"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="32"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="235"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="39"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="39"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="236"/>
         <source>Host</source>
         <translation>Värd</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="46"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="237"/>
         <source>Proxy type</source>
         <translation>Proxy-typ</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="56"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="238"/>
         <source>Username</source>
         <translation>Användarnamn</translation>
@@ -11973,12 +7382,6 @@ Se https://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="108"/>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="172"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
@@ -11986,151 +7389,94 @@ Se https://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="134"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="240"/>
         <source>Requires authentication</source>
         <translation>Kräver autentisering</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.ui" line="156"/>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_network.h" line="241"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="139"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface molnlagringstjänst</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.6/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-postadress</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Verifikations PIN</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Nytt lösenord</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Spara lösenord lokalt?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="11"/>
         <source>Network</source>
         <translation>Nätverk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>No proxy</source>
         <translation>Ingen proxy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>System proxy</source>
         <translation>Använd systemets proxyinställningar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.6/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"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Förändring ignorerad. E-post och lösenord till molnlagringstjänsten kan endast bestå av bokstäver, siffror och &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, samt &apos;+&apos;.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Förändring ignorerad. E-post och nytt lösenord till molnlagringstjänsten kan endast bestå av bokstäver, siffror &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, samt &apos;+&apos;.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/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-post och lösenord till molnlagringstjänsten kan endast bestå av bokstäver, siffror samt &apos;.&apos;, &apos;-&apos;, &apos;_&apos; och &apos;+&apos;.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="133"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Subsurface molnlagring (uppgifter verifierade)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="135"/>
         <source>Subsurface cloud storage (incorrect password)</source>
         <translation>Subsurface molnlagring (felaktigt lösenord)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_network.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_network.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_network.cpp" line="137"/>
         <source>Subsurface cloud storage (PIN required)</source>
         <translation>Subsurface molnlagring (PIN krävs)</translation>
     </message>
@@ -12139,342 +7485,228 @@ Se https://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     <name>PreferencesUnits</name>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="346"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="20"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="347"/>
         <source>Unit system</source>
         <translation>Måttenheter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="26"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="348"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="33"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="349"/>
         <source>&amp;Metric</source>
         <translation>&amp;Metriska</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="40"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="350"/>
         <source>Imperial</source>
         <translation>Brittiska</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="47"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="351"/>
         <source>Personali&amp;ze</source>
         <translation>Anpass&amp;ad</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="57"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="352"/>
         <source>Individual settings</source>
         <translation>anpassade inställningar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="69"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="353"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="76"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="354"/>
         <source>meter</source>
         <translation>meter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="86"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="355"/>
         <source>feet</source>
         <translation>fot</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="96"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="356"/>
         <source>Pressure</source>
         <translation>Tryck</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="103"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="357"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="113"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="358"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="123"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="359"/>
         <source>Volume</source>
         <translation>Volym</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="130"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="360"/>
         <source>&amp;liter</source>
         <translation>&amp;liter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="140"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="361"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="150"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="362"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="157"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="157"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="363"/>
         <source>celsius</source>
         <translation>celsius</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="167"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="167"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="364"/>
         <source>fahrenheit</source>
         <translation>fahrenheit</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="177"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="365"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="184"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="366"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="194"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="367"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="207"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="368"/>
         <source>Time units</source>
         <translation>Tidsenheter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="213"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="369"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Nämnare vid uppstigning/nedstigning </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="220"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="370"/>
         <source>Minutes</source>
         <translation>Minuter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="227"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="371"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="237"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="237"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="237"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="237"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="372"/>
         <source>Duration units</source>
         <translation>Enhet för tidsåtgång</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="243"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="373"/>
         <source>Show hours in duration</source>
         <translation>Visa timmar vid tidsåtgång</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="250"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="374"/>
         <source>hh:mm (always)</source>
         <translation>hh:mm (alltid)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="257"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="375"/>
         <source>mm (always)</source>
         <translation>mm (alltid)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="264"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="376"/>
         <source>mm (for dives shorter than 1 hour), hh:mm (otherwise)</source>
         <translation>mm (för dyk kortare än 1 timme), hh:mm (annars)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="274"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="274"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="274"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="377"/>
         <source>Dive list table</source>
         <translation>Dyklisttabell</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="280"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="280"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="280"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="378"/>
         <source>Show units in dive list table</source>
         <translation>Visa enheter i dyklistan</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="290"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="290"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="290"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="379"/>
         <source>GPS coordinates</source>
         <translation>GPS-koordinater</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="296"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="380"/>
         <source>Location Display</source>
         <translation>Platsvisning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="303"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="381"/>
         <source>traditional (dms)</source>
         <translation>traditionell (dms)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.ui" line="310"/>
         <location filename="../subsurface/desktop-widgets/preferences/ui_preferences_units.h" line="382"/>
         <source>decimal</source>
         <translation>decimal</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/preferences/preferences_units.cpp" line="7"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/preferences/preferences_units.cpp" line="7"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/preferences/preferences_units.cpp" line="7"/>
         <source>Units</source>
         <translation>Enheter</translation>
     </message>
@@ -12483,25 +7715,16 @@ Se https://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     <name>PrintDialog</name>
     <message>
         <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printdialog.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printdialog.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printdialog.cpp" line="104"/>
         <source>P&amp;rint</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printdialog.cpp" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printdialog.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printdialog.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printdialog.cpp" line="107"/>
         <source>&amp;Preview</source>
         <translation>Förhandsvisning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printdialog.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printdialog.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printdialog.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printdialog.cpp" line="119"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
@@ -12510,99 +7733,66 @@ Se https://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     <name>PrintOptions</name>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="29"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="168"/>
         <source>Print type</source>
         <translation>Typ av utskrift</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="41"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="169"/>
         <source>&amp;Dive list print</source>
         <translation>&amp;Utskrift av dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="57"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="170"/>
         <source>&amp;Statistics print</source>
         <translation>&amp;Utskrift av statistik</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="67"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="67"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="171"/>
         <source>Print options</source>
         <translation>Utskriftsalternativ</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="79"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="172"/>
         <source>Print only selected dives</source>
         <translation>Skriv bara ut markerade dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="92"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="173"/>
         <source>Print in color</source>
         <translation>Skriv ut i färg</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="102"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="174"/>
         <source>Template</source>
         <translation>Mall</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="127"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="175"/>
         <source>Edit</source>
         <translation>Redigera</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="134"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="176"/>
         <source>Delete</source>
         <translation>Radera</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="141"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="177"/>
         <source>Export</source>
         <translation>Exportera</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.ui" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.ui" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.ui" line="148"/>
         <location filename="../subsurface/desktop-widgets/ui_printoptions.h" line="178"/>
         <source>Import</source>
         <translation>Importera</translation>
@@ -12612,26 +7802,11 @@ Se https://doc.qt.io/qt-5/qdatetime.html#toString</translation>
         <location filename="../desktop-widgets/printoptions.cpp" line="158"/>
         <location filename="../desktop-widgets/printoptions.cpp" line="194"/>
         <location filename="../desktop-widgets/printoptions.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="226"/>
         <source>Read-only template!</source>
         <translation>Skrivskyddad mall!</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="132"/>
         <source>The template '%1' is read-only and cannot be edited.
 Please export this template to a different file.</source>
         <translation>Mallen &apos;%1&apos; är skrivskyddad och kan inte ändras.
@@ -12639,65 +7814,38 @@ Vänligen exportera mallen till en ny fil.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="148"/>
         <source>Import template file</source>
         <translation>Importera mall från fil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="149"/>
         <location filename="../desktop-widgets/printoptions.cpp" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="180"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="180"/>
         <source>HTML files</source>
         <translation>HTML filer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="159"/>
         <location filename="../desktop-widgets/printoptions.cpp" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="195"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="195"/>
         <source>The destination template &apos;%1&apos; is read-only and cannot be overwritten.</source>
         <translation>Destinations mallen &apos;%1&apos; är skrivskyddad och kan inte ändras.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="179"/>
         <source>Export template files as</source>
         <translation>Exportera mall som</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="219"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="219"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="219"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="219"/>
         <source>This action cannot be undone!</source>
         <translation>Denna åtgärd kan inte ångras!</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="220"/>
         <source>Delete template &apos;%1&apos;?</source>
         <translation>Radera mall &apos;%1&apos;?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/printoptions.cpp" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/printoptions.cpp" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/printoptions.cpp" line="227"/>
         <source>The template &apos;%1&apos; is read-only and cannot be deleted.</source>
         <translation>Mallen &apos;%1&apos; är skrivskyddad och kan inte raderas.</translation>
     </message>
@@ -12706,218 +7854,137 @@ Vänligen exportera mallen till en ny fil.</translation>
     <name>ProfileWidget2</name>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="814"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 av %2)</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="810"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="810"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="810"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="810"/>
         <source>Unknown dive computer</source>
         <translation>Okänd dykdator</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="840"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="840"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="840"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="840"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="837"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Visa NDL / TTS stängdes av för att beräkningen tog för lång tid</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1452"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1452"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1452"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1451"/>
         <source>Add gas change</source>
         <translation>Lägg till gasbyte</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1438"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1438"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1438"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1435"/>
         <source>Make first dive computer</source>
         <translation>Gör till första dykdator</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="806"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="806"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="806"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="806"/>
         <source>Planned dive</source>
         <translation>Planera dyk</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="808"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="808"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="808"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="808"/>
         <source>Manually added dive</source>
         <translation>Manuellt dyk</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1440"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1440"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1440"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1440"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
         <source>Delete this dive computer</source>
         <translation>Ta bort denna dykdator</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1441"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Split this dive computer into own dive</source>
         <translation>Dela dykdator till ett eget dyk</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1457"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1455"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1455"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1455"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
         <source> (cyl. %1)</source>
         <translation>(cyl. %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1463"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1461"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1461"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1461"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
         <source>Add setpoint change</source>
         <translation>Lägg till setpoint byte</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1465"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1463"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1463"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1463"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1462"/>
         <source>Add bookmark</source>
         <translation>Lägg till bokmärke</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1467"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1465"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1465"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1465"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1464"/>
         <source>Split dive into two</source>
         <translation>Dela dyk i två delar</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1477"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1475"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1475"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1475"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
         <source>Change divemode</source>
         <translation>Ändra dykläge</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1501"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1499"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1499"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1499"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1498"/>
         <source>Edit the profile</source>
         <translation>Editera profilen</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1505"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1503"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1503"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1503"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1502"/>
         <source>Remove event</source>
         <translation>Ta bort händelse</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1508"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1508"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1508"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1507"/>
         <source>Hide similar events</source>
         <translation>Göm liknande händelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1517"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1515"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1515"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1515"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
         <source>Edit name</source>
         <translation>Ändra namn</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1548"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1555"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1546"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1553"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1546"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1553"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1546"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1553"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1545"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1552"/>
         <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source>
         <translation>Förändra trycket i flaska %1 (nu beräknat till %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1570"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1568"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1568"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1568"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1567"/>
         <source>Unhide all events</source>
         <translation>Visa alla händelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1603"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1603"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1603"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide events</source>
         <translation>Göm händelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1603"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1603"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1603"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide all %1 events?</source>
         <translation>Göm alla %1händelser</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1638"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1638"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1638"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1630"/>
         <source>Remove the selected event?</source>
         <translation>Ta bort markerad händelse</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1639"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1639"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1631"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1787"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1792"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1792"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1792"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1783"/>
         <source>Edit name of bookmark</source>
         <translation>Ändra namnet på bokmärket</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1788"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1793"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1793"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1793"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1784"/>
         <source>Custom name:</source>
         <translation>Valt namn:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1793"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1798"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1798"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1798"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1789"/>
         <source>Name is too long!</source>
         <translation>Namnet är för långt!</translation>
     </message>
@@ -12925,242 +7992,151 @@ Vänligen exportera mallen till en ny fil.</translation>
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="205"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="207"/>
         <source>Starting...</source>
         <translation>Startar...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="275"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="259"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/>
         <source>Open local dive data file</source>
         <translation>Öppna lokal dyklogg</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="267"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Opening local data file failed</source>
         <translation>Misslyckades med att öppna lokal datafil</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="297"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="297"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="297"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/>
         <source>%1 dives loaded from local dive data file</source>
         <translation>%1 dyk importerade från lokal dykloggfil</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="395"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/>
         <source>working in no-cloud mode</source>
         <translation>använder lokalt läge</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="399"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="425"/>
         <source>Error parsing local storage, giving up</source>
         <translation>Kunde inte läsa lokal lagring, ger upp.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="427"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="408"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="434"/>
         <source>no cloud credentials</source>
         <translation>inga molnlagringsuppgifter</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="428"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="485"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>Ange giltiga uppgifter för molnlagrinstjänsten</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="441"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/>
         <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-post och lösenord till molnlagringstjänsten kan endast bestå av bokstäver, siffror samt &apos;.&apos;, &apos;-&apos;, &apos;_&apos; och &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="447"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="447"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="447"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="473"/>
         <source>Invalid format for email address</source>
         <translation>Ogiltigt format för e-postadress</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="496"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>Försöker öppna molnlagringstjänst med nya uppgifter</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="518"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="544"/>
         <source>Testing cloud credentials</source>
         <translation>Testar molnuppgifter</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="533"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="559"/>
         <source>No response from cloud server to validate the credentials</source>
         <translation>Inget svar från molntjänsten vid verifiering av uppgifter</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="541"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="567"/>
         <source>Incorrect cloud credentials</source>
         <translation>Felaktiga molnuppgifter</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="547"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation>Kan inte ansluta till molnlagringstjänst - kontouppgifter är inte verifierade</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="593"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="574"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="600"/>
         <source>Cloud credentials are invalid</source>
         <translation>Ogiltiga uppgifter till molnlagringstjänst</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="607"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="588"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="588"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="588"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>Kan inte öppna molnlagringstjänst: Misslyckades med att skapa en https-anslutning</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="602"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="602"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="602"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="628"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>Kan inte öppna molnlagring: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="634"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="615"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="615"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="615"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="641"/>
         <source>Cannot connect to cloud storage</source>
         <translation>Kan inte ansluta till molnlagringstjänst</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="620"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="620"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="620"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="646"/>
         <source>Cloud credentials valid, loading dives...</source>
         <translation>Molnuppgifter giltiga, laddar dyk...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="649"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="630"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="630"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="630"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="656"/>
         <source>Cloud storage error: %1</source>
         <translation>Fel uppstod i molnlagringstjänsten: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="695"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="676"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="676"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="676"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="702"/>
         <source>Loading dives from local storage (&apos;no cloud&apos; mode)</source>
         <translation>Läser in dyk från lokal lagring (&apos;lokalt läge&apos;)</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="722"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="748"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>Misslyckades med att ansluta till molntjänsten, återgår till lokalt läge</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="766"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="747"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="747"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="747"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>Lyckades öppna molnlagrinstjänsten. Inga dyk i dyklistan.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="921"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="922"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="919"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="920"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="919"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="920"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="942"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="921"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="922"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="923"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="919"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="920"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="921"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="919"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="920"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="921"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="953"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="921"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="919"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="919"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
         <source>sec</source>
         <translation>sek</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1479"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlmanager.cpp" line="1350"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlmanager.cpp" line="1348"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlmanager.cpp" line="1348"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1048"/>
+        <source>weight</source>
+        <translation>Vikt</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1493"/>
         <source>Unknown GPS location</source>
         <translation>Okänd GPS-position</translation>
     </message>
@@ -13169,9 +8145,6 @@ Vänligen exportera mallen till en ny fil.</translation>
     <name>QMLPrefs</name>
     <message>
         <location filename="../mobile-widgets/qmlprefs.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qmlprefs.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qmlprefs.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qmlprefs.cpp" line="138"/>
         <source>Starting...</source>
         <translation>Startar...</translation>
     </message>
@@ -13179,129 +8152,60 @@ Vänligen exportera mallen till en ny fil.</translation>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2151"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2151"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2151"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2151"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2153"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2148"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2148"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2148"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2148"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2131"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2139"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2150"/>
         <source>Failed!</source>
         <translation>Misslyckad!</translation>
     </message>
 </context>
 <context>
-    <name>RemoveAutogenTrips</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="688"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="688"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="688"/>
-        <source>remove autogenerated trips</source>
-        <translation>ta bort autogenererade resor</translation>
-    </message>
-</context>
-<context>
-    <name>RemoveDivesFromTrip</name>
-    <message numerus="yes">
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="680"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="680"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="680"/>
-        <source>remove %n dive(s) from trip</source>
-        <translation><numerusform>ta bort %n dyk från resan</numerusform><numerusform>ta bort %n dyk från resan</numerusform></translation>
-    </message>
-</context>
-<context>
     <name>RenumberDialog</name>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/renumber.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/renumber.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/renumber.ui" line="17"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="88"/>
         <source>Renumber</source>
         <translation>Uppdatera numrering</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/renumber.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/renumber.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/renumber.ui" line="43"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="89"/>
         <source>Renumbering all dives</source>
         <translation>Uppdaterar numrering för alla dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="137"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="139"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="150"/>
         <source>New starting number</source>
         <translation>Nytt startnummer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="148"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="137"/>
         <source>New number</source>
         <translation>Nytt nummer</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="153"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
         <source>Renumber selected dives</source>
         <translation>Uppdatera numrering för valda dyk</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="155"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="144"/>
         <source>Renumber all dives</source>
         <translation>Uppdatera numrering för alla dyk</translation>
     </message>
 </context>
 <context>
-    <name>RenumberDives</name>
-    <message numerus="yes">
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="640"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="640"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="640"/>
-        <source>renumber %n dive(s)</source>
-        <translation><numerusform>uppdatera numrering för %n dyk</numerusform><numerusform>uppdatera numrering för %n dyk</numerusform></translation>
-    </message>
-</context>
-<context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2248"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2248"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2248"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2248"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2250"/>
         <source>Reset settings failed!</source>
         <translation>Återställning av inställningar misslyckades!</translation>
     </message>
@@ -13310,9 +8214,6 @@ Vänligen exportera mallen till en ny fil.</translation>
     <name>SearchBar</name>
     <message>
         <location filename="../desktop-widgets/searchbar.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/searchbar.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/searchbar.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/searchbar.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_searchbar.h" line="120"/>
         <source>Form</source>
         <translation>Form</translation>
@@ -13322,27 +8223,18 @@ Vänligen exportera mallen till en ny fil.</translation>
     <name>SetpointDialog</name>
     <message>
         <location filename="../desktop-widgets/setpoint.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/setpoint.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/setpoint.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/setpoint.ui" line="17"/>
         <location filename="../subsurface/desktop-widgets/ui_setpoint.h" line="82"/>
         <source>Add setpoint change</source>
         <translation>Lägg till setpoint byte</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/setpoint.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/setpoint.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/setpoint.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/setpoint.ui" line="43"/>
         <location filename="../subsurface/desktop-widgets/ui_setpoint.h" line="83"/>
         <source>New setpoint (0 for OC)</source>
         <translation>Ny setpoint (0 för OC)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/setpoint.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/setpoint.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/setpoint.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/setpoint.ui" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_setpoint.h" line="84"/>
         <source>bar</source>
         <translation>bar</translation>
@@ -13352,105 +8244,66 @@ Vänligen exportera mallen till en ny fil.</translation>
     <name>Settings</name>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="16"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="20"/>
         <source>Undefined</source>
         <translation>Odefinierad</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="21"/>
         <source>Incorrect username/password combination</source>
         <translation>Felaktig kombination av användarnamn/lösenord</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="22"/>
         <source>Credentials need to be verified</source>
         <translation>Uppgifterna behöver verifieras</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="23"/>
         <source>Credentials verified</source>
         <translation>Uppgifter verifierade</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="24"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="24"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="24"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="24"/>
         <source>No cloud mode</source>
         <translation>Lokalt läge</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="33"/>
         <source>Cloud status</source>
         <translation>Status molnlagringstjänst</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="42"/>
         <source>Email</source>
         <translation>E-post</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="47"/>
         <source>Not applicable</source>
         <translation>Inte tillämplig</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="53"/>
         <source>Change</source>
         <translation>Ändra</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="60"/>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="84"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="84"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="84"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="84"/>
         <source>Theme</source>
         <translation>Tema</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="93"/>
         <source>Blue</source>
         <translation>Blå</translation>
     </message>
@@ -13458,15 +8311,6 @@ Vänligen exportera mallen till en ny fil.</translation>
         <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"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="163"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="218"/>
         <source>regular text</source>
         <translation>vanlig text</translation>
     </message>
@@ -13474,175 +8318,106 @@ Vänligen exportera mallen till en ny fil.</translation>
         <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"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="234"/>
         <source>Highlight</source>
         <translation>Markera</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="148"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="148"/>
         <source>Pink</source>
         <translation>Rosa</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="202"/>
         <source>Dark</source>
         <translation>Mörk</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="255"/>
         <source>Scaling</source>
         <translation>Skala</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="268"/>
         <source>smaller</source>
         <translation>mindre</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="276"/>
         <source>regular</source>
         <translation>normal</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="284"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="284"/>
         <source>larger</source>
         <translation>större</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="306"/>
         <source>GPS location service</source>
         <translation>GPS-platstjänst</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="316"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="316"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="316"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="316"/>
         <source>Distance threshold (meters)</source>
         <translation>Avståndsgräns (meter)</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="332"/>
         <source>Time threshold (minutes)</source>
         <translation>Tidsgräns (minuter)</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="361"/>
         <source>Default Cylinder</source>
         <translation>Standardflaska</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="370"/>
         <source>Cylinder:</source>
         <translation>Flaska:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="395"/>
         <source>Dive computers</source>
         <translation>Dykdatorer</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="404"/>
         <source>Forget remembered dive computers</source>
         <translation>Rensa ihågkomna dykdatorer</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="410"/>
         <source>Forget</source>
         <translation>Rensa</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="432"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="432"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="432"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="432"/>
         <source>Units</source>
         <translation>Enheter</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="442"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="442"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="442"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="442"/>
         <source>Use Imperial Units</source>
         <translation>Använd brittiska måttenheter</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="458"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="458"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="458"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="458"/>
         <source>Use Metric Units</source>
         <translation>Använd metersystemet</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="486"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="486"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="486"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="486"/>
         <source>Filter preferences</source>
         <translation>Filtreringsinställningar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="495"/>
         <source>Include notes in full text filtering</source>
         <translation>Inkludera anteckningar vid textfiltrering</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="510"/>
         <source>Match filter case sensitive</source>
         <translation>Skiftlägeskänslig filtrering</translation>
     </message>
@@ -13660,17 +8435,11 @@ even if not recognized as dive computers</source>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="572"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="537"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="537"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="537"/>
         <source>Developer</source>
         <translation>Utvecklare</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Settings.qml" line="582"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/Settings.qml" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/Settings.qml" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/Settings.qml" line="547"/>
         <source>Display Developer menu</source>
         <translation>Visa utvecklarmeny</translation>
     </message>
@@ -13679,54 +8448,36 @@ even if not recognized as dive computers</source>
     <name>ShiftImageTimesDialog</name>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="23"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="194"/>
         <source>Shift selected image times</source>
         <translation>Ändra tid för valda bilder</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="195"/>
         <source>Shift times of image(s) by</source>
         <translation>Ändra tider för bild(er) med</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="95"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="196"/>
         <source>h:mm</source>
         <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="105"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="105"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="197"/>
         <source>Earlier</source>
         <translation>Tidigare</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="112"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="198"/>
         <source>Later</source>
         <translation>Senare</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="128"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="199"/>
         <source>Warning!
 Not all media files have timestamps in the range between
@@ -13737,152 +8488,94 @@ tidsintervallet 30 minuter före och 30 minuter efter slutet av ett dyk.</transl
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="137"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="202"/>
         <source>Load media files even if the time does not match the dive time</source>
         <translation>Lägg till mediafiler även om tidsstämpeln inte matchar dyktiden</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="186"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="204"/>
         <source>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive compuer displaying the current time. Download that image to your computer and press this button.</source>
         <translation>För att beräkna och uppväga skillnaden mellan klockan i din dykdator och din kamera använd kameran för att ta en bild av dykdatorn när den visar nuvarande tid. Ladda sedan ned bilden till din dator och tryck på den här knappen.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="196"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="206"/>
         <source>Determine camera time offset</source>
         <translation>Detektera kamerans tidsskevning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="199"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="199"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="199"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="199"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="208"/>
         <source>Select image of divecomputer showing time</source>
         <translation>Välj en bild som visar dykdatorns tid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shiftimagetimes.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shiftimagetimes.ui" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shiftimagetimes.ui" line="221"/>
         <location filename="../subsurface/desktop-widgets/ui_shiftimagetimes.h" line="210"/>
         <source>Which date and time are displayed on the image?</source>
         <translation>Vilket datum och tid visas på bilden?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="283"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="296"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="285"/>
         <source>Open image file</source>
         <translation>Öppna bildfler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="285"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="297"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="297"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="298"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="287"/>
         <source>Image files</source>
         <translation>Bildfiler</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="366"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="379"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="368"/>
         <source>Selected dive date/time</source>
         <translation>Valt dyk datum/tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="368"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="380"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="381"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
         <source>First selected dive date/time</source>
         <translation>Första valda dyk datum/tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="382"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="371"/>
         <source>Last selected dive date/time</source>
         <translation>Senast valda dyk datum/tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="383"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="384"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/>
         <source>
 Files with inappropriate date/time</source>
         <translation>
 Filer med felaktig datum/tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="394"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="383"/>
         <source>No Exif date/time found</source>
         <translation>Inget Exif datum/tid hittat</translation>
     </message>
 </context>
 <context>
-    <name>ShiftTime</name>
-    <message numerus="yes">
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="597"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="597"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="597"/>
-        <source>shift time of %n dives</source>
-        <translation><numerusform>ändra tider på %n dyk</numerusform><numerusform>ändra tider på %n dyk</numerusform></translation>
-    </message>
-</context>
-<context>
     <name>ShiftTimesDialog</name>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="23"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="136"/>
         <source>Shift selected dive times</source>
         <translation>Korrigera markerade dyktider</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="49"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="137"/>
         <source>Shift times of selected dives by</source>
         <translation>Korrigera markerade dyktider med</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="72"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="138"/>
         <source>Shifted time:</source>
         <translation>Korrigerad tid:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="79"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="139"/>
         <source>Current time:</source>
         <translation>Nuvarande tid:</translation>
@@ -13890,12 +8583,6 @@ Filer med felaktig datum/tid</translation>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="86"/>
         <location filename="../desktop-widgets/shifttimes.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="93"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="140"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="141"/>
         <source>0:0</source>
@@ -13903,27 +8590,18 @@ Filer med felaktig datum/tid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="126"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="142"/>
         <source>h:mm</source>
         <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="136"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="143"/>
         <source>Earlier</source>
         <translation>Tidigare</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/shifttimes.ui" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/shifttimes.ui" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/shifttimes.ui" line="143"/>
         <location filename="../subsurface/desktop-widgets/ui_shifttimes.h" line="144"/>
         <source>Later</source>
         <translation>Senare</translation>
@@ -13933,318 +8611,81 @@ Filer med felaktig datum/tid</translation>
     <name>Smrtk2ssrfcWindow</name>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="20"/>
         <source>SmartTrak files importer</source>
         <translation>SmartTrak filimporterare</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="79"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface dyklogg&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="111"/>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="177"/>
         <source>Choose</source>
         <translation>Välj</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="133"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak dyklogg&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="242"/>
         <source>Exit</source>
         <translation>Avsluta</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="270"/>
         <source>Import</source>
         <translation>Importera</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Select the .slg file(s) you want to import to Subsurface format, and the exported .xml file. It&apos;s advisable to use a new output file, as its actual content will be erased.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Välj de .slg filer du vill importera till Subsurface-format samt den exporterade .xml filen. Det är rekommenderat att spara till en ny fil eftersom innehållet kommer att raderas.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.ui" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.ui" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.ui" line="377"/>
         <source>Import messages (errors, warnings, etc)</source>
         <translation>Importera meddelanden (fel, varningar, etc)</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
         <source>Open SmartTrak files</source>
         <translation>Öppna SmartTrak filer</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
         <source>SmartTrak files</source>
         <translation>SmartTrak filer</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>All files</source>
         <translation>Alla filer</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>Subsurface files</source>
         <translation>Subsurface filer</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
         <source>Open Subsurface files</source>
         <translation>Öppna Subsurface filer</translation>
     </message>
 </context>
 <context>
-    <name>SocialNetworkDialog</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/>
-        <source>Small</source>
-        <translation>Små</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/>
-        <source>Medium</source>
-        <translation>Medium</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/>
-        <source>Dive date: %1 
-</source>
-        <translation>Dykdatum: %1 
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/>
-        <source>Duration: %1 
-</source>
-        <translation>Varaktighet: %1 
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/>
-        <source>h</source>
-        <comment>abbreviation for hours</comment>
-        <translation>h</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/>
-        <source>min</source>
-        <comment>abbreviation for minutes</comment>
-        <translation>Min</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/>
-        <source>Dive location: %1 
-</source>
-        <translation>Dykplats: %1 
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/>
-        <source>Buddy: %1 
-</source>
-        <translation>Parkamrat: %1 
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/>
-        <source>Divemaster: %1 
-</source>
-        <translation>Divemaster: %1 
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/>
-        <source>
-%1</source>
-        <translation>
-%1</translation>
-    </message>
-</context>
-<context>
-    <name>SocialnetworksDialog</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/>
-        <source>Small</source>
-        <translation>Små</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/>
-        <source>Medium</source>
-        <translation>Medium</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/>
-        <source>Big</source>
-        <translation>Stor</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/>
-        <source>The text to the right will be posted as the description with your dive profile graph to Facebook. The album name is required (the profile graph will be posted to that album).</source>
-        <translation>Texten till höger kommer att anges som beskrivning till grafen av din dykprofil på Facebook. Namnet på albumet är obligatoriskt (dykprofilen kommer att laddas upp till det albumet).</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/>
-        <source>Album</source>
-        <translation>Album</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="64"/>
-        <source>The profile picture will be posted in this album (required)</source>
-        <translation>Dykprofilbilden kommer att laddas upp till det albumet (obligatoriskt).</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="71"/>
-        <source>Include</source>
-        <translation>Inkludera</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="78"/>
-        <source>Date and time</source>
-        <translation>Datum och tid</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="85"/>
-        <source>Duration</source>
-        <translation>Varaktighet</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="92"/>
-        <source>Location</source>
-        <translation>Plats</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="99"/>
-        <source>Divemaster</source>
-        <translation>Divemaster</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="106"/>
-        <source>Buddy</source>
-        <translation>Parkamrat</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="113"/>
-        <source>Notes</source>
-        <translation>Anteckningar</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="126"/>
-        <source>Facebook post preview</source>
-        <translation>Förhandsvisning av Facebookinlägg</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/>
-        <source>Image Size</source>
-        <translation>Bildstorlek</translation>
-    </message>
-</context>
-<context>
-    <name>SplitDives</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/command_divelist.cpp" line="748"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/command_divelist.cpp" line="748"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/command_divelist.cpp" line="748"/>
-        <source>split dive</source>
-        <translation>dela dyk</translation>
-    </message>
-</context>
-<context>
     <name>StartPage</name>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/StartPage.qml" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/StartPage.qml" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/StartPage.qml" line="37"/>
         <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>För att använda Subsurface-mobile med molnlagringstjänsten, vänligen ange dina uppgifter.&lt;br/&gt;&lt;br/&gt;Om det är första gången du använder tjänsten, ange en giltig e-postadress (bara små bokstäver) och ett lösenord (bokstäver och siffror).&lt;br/&gt;&lt;br/&gt;För att endast använda Subsurface-mobile med lokalt sparad data, klicka på lokalt läge ovan.</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/StartPage.qml" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/StartPage.qml" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/StartPage.qml" line="50"/>
         <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>Tack för att du registrerade dig med Subsurface. Vi skickade &lt;b&gt;%1&lt;/b&gt; en PIN-kod för att avsluta registreringen. Om du inte får ett e-postmeddelande från oss inom 15 minuter, vänligen kontrollera stavningen av din e-postadress samt din mapp för skräppost. &lt;br/&gt;&lt;br/&gt;Om du har några problem gällande ditt konto, vänligen kontakta oss via användarforumet (https://subsurface-divelog.org/user-forum/).&lt;br/&gt;&lt;br/&gt;</translation>
     </message>
@@ -14253,83 +8694,41 @@ Filer med felaktig datum/tid</translation>
     <name>SubsurfaceAbout</name>
     <message>
         <location filename="../desktop-widgets/about.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/about.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/about.ui" line="23"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/about.ui" line="23"/>
         <location filename="../subsurface/desktop-widgets/ui_about.h" line="118"/>
         <source>About Subsurface</source>
         <translation>Om Subsurface</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/about.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/about.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/about.ui" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/about.ui" line="83"/>
         <location filename="../subsurface/desktop-widgets/ui_about.h" line="121"/>
         <source>&amp;License</source>
         <translation>&amp;Licens</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/about.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/about.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/about.ui" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/about.ui" line="90"/>
         <location filename="../subsurface/desktop-widgets/ui_about.h" line="122"/>
         <source>Credits</source>
         <translation>Skapare</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/about.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/about.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/about.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/about.ui" line="97"/>
         <location filename="../subsurface/desktop-widgets/ui_about.h" line="123"/>
         <source>&amp;Website</source>
         <translation>&amp;Hemsida</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/about.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/about.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/about.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/about.ui" line="104"/>
         <location filename="../subsurface/desktop-widgets/ui_about.h" line="124"/>
         <source>&amp;Close</source>
         <translation>&amp;Stäng</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/about.cpp" line="20"/>
-        <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2018&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multiplatform-mjukvara för dykloggning&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, med flera, 2011-2018&lt;/span&gt;</translation>
-    </message>
-    <message>
         <location filename="../desktop-widgets/about.cpp" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/about.cpp" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/about.cpp" line="20"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2019&lt;/span&gt;</source>
         <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-plattform dykprogramvara&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2019&lt;/span&gt;</translation>
     </message>
 </context>
 <context>
-    <name>SuitFilter</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="598"/>
-        <source>Suits</source>
-        <translation>Dräkter</translation>
-    </message>
-</context>
-<context>
-    <name>SuitsFilterModel</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/filtermodels.cpp" line="335"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/filtermodels.cpp" line="335"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/filtermodels.cpp" line="335"/>
-        <source>No suit set</source>
-        <translation>Ingen dräkt vald</translation>
-    </message>
-</context>
-<context>
     <name>TabDiveEquipment</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.ui" line="6"/>
@@ -14337,33 +8736,50 @@ Filer med felaktig datum/tid</translation>
         <translation>Utrustning</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="48"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.ui" line="74"/>
+        <source>Suit</source>
+        <translation>Dräkt</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
         <source>Cylinders</source>
         <translation>Flaskor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="49"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
         <source>Add cylinder</source>
         <translation>Lägg till flaska</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="56"/>
         <source>Weights</source>
         <translation>Vikter</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/>
         <source>Add weight system</source>
         <translation>Lägg till viktsystem</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="60"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="64"/>
+        <source>Undo</source>
+        <translation>Ångra</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="306"/>
+        <source>Warning: edited %1 dives</source>
+        <translation>Varning: redigerade %1 dyk</translation>
+    </message>
 </context>
 <context>
     <name>TabDiveExtraInfo</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveExtraInfo.h" line="49"/>
         <source>Extra Info</source>
         <translation>Extra Info</translation>
@@ -14373,90 +8789,60 @@ Filer med felaktig datum/tid</translation>
     <name>TabDiveInformation</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="297"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="59"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="298"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="78"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="300"/>
         <source>Interval</source>
         <translation>Ytintervall</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="97"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="302"/>
         <source>Gases used</source>
         <translation>Använd gas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="116"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="304"/>
         <source>Gas consumed</source>
         <translation>Förbrukad gas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="135"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="306"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="154"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="173"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="192"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="312"/>
         <source>Max. depth</source>
         <translation>Max. djup</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="211"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="314"/>
         <source>Avg. depth</source>
         <translation>Medeldjup</translation>
@@ -14467,94 +8853,58 @@ Filer med felaktig datum/tid</translation>
         <translation>Atm. tryck</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="230"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="316"/>
         <source>Air pressure</source>
         <translation>Lufttryck</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="249"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="268"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="268"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="320"/>
         <source>Water temp.</source>
         <translation>Vattentemp.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="299"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="287"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="287"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="287"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="322"/>
         <source>Dive time</source>
         <translation>Dyktid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="318"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.ui" line="306"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveInformation.h" line="324"/>
         <source>Water type</source>
         <translation>Vattentyp</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="71"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="71"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
         <source>min</source>
         <translation>Min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/>
         <source>sec</source>
         <translation>sek</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
         <source>d</source>
         <translation>d</translation>
     </message>
@@ -14563,67 +8913,43 @@ Filer med felaktig datum/tid</translation>
     <name>TabDivePhotos</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDivePhotos.h" line="78"/>
         <source>Photos</source>
         <translation>Bilder</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDivePhotos.h" line="79"/>
         <source>Zoom level</source>
         <translation>Zoomnivå</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/>
         <source>Load media from file(s)</source>
         <translation>Lägg till media från fil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/>
         <source>Load media file(s) from web</source>
         <translation>Lägg till media från webb</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/>
         <source>Delete selected media files</source>
         <translation>Radera markerade mediafiler</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/>
         <source>Delete all media files</source>
         <translation>Radera alla mediafiler</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="58"/>
         <source>Open folder of selected media files</source>
         <translation>Öppna mapp med markerade mediafiler</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="59"/>
         <source>Recalculate selected thumbnails</source>
         <translation>Uppdatera markerade miniatyrer</translation>
     </message>
@@ -14634,17 +8960,11 @@ Filer med felaktig datum/tid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/>
         <source>Deleting media files</source>
         <translation>Raderar mediafiler</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="122"/>
         <source>Are you sure you want to delete all media files?</source>
         <translation>Är du säker på att du vill radera alla mediafiler?</translation>
     </message>
@@ -14672,35 +8992,23 @@ Filer med felaktig datum/tid</translation>
     <name>TabDiveStatistics</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="194"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="73"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="195"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="128"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="200"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="97"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="197"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
@@ -14712,125 +9020,80 @@ Filer med felaktig datum/tid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="109"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="198"/>
         <source>Total time</source>
         <translation>Total tid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="140"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="201"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="85"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="196"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="159"/>
         <location filename="../subsurface/desktop-widgets/ui_TabDiveStatistics.h" line="203"/>
         <source>Gas consumption</source>
         <translation>Gasförbrukning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/>
         <source>Highest total SAC of a dive</source>
         <translation>Högsta totala SAC på ett dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Lägsta totala SAC på ett dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Genomsnittlig SAC för markerade dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/>
         <source>Highest temperature</source>
         <translation>Högsta temperatur</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/>
         <source>Lowest temperature</source>
         <translation>Lägsta temperatur</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/>
         <source>Average temperature of all selected dives</source>
         <translation>Genomsnittlig temperatur för markerade dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/>
         <source>Deepest dive</source>
         <translation>Djupaste dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/>
         <source>Shallowest dive</source>
         <translation>Grundaste dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/>
         <source>Longest dive</source>
         <translation>Längsta dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/>
         <source>Shortest dive</source>
         <translation>Kortaste dyk</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="22"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="22"/>
         <source>Average length of all selected dives</source>
         <translation>Genomsnittlig längd för markerade dyk</translation>
     </message>
@@ -14838,15 +9101,6 @@ Filer med felaktig datum/tid</translation>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="72"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
@@ -14855,18 +9109,6 @@ Filer med felaktig datum/tid</translation>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
         <source>h</source>
         <translation>h</translation>
     </message>
@@ -14875,18 +9117,6 @@ Filer med felaktig datum/tid</translation>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
         <source>min</source>
         <translation>Min</translation>
     </message>
@@ -14895,26 +9125,11 @@ Filer med felaktig datum/tid</translation>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="97"/>
         <source>sec</source>
         <translation>sek</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="126"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -14924,25 +9139,16 @@ mixas av luft och:
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="128"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="132"/>
         <source>and</source>
         <translation>och</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="134"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
@@ -14952,12 +9158,6 @@ mixas av luft och:
     <message>
         <location filename="../desktop-widgets/tableview.ui" line="14"/>
         <location filename="../desktop-widgets/tableview.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tableview.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/tableview.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tableview.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/tableview.ui" line="17"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tableview.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/tableview.ui" line="17"/>
         <location filename="../subsurface/desktop-widgets/ui_tableview.h" line="49"/>
         <location filename="../subsurface/desktop-widgets/ui_tableview.h" line="50"/>
         <source>GroupBox</source>
@@ -14965,48 +9165,19 @@ mixas av luft och:
     </message>
 </context>
 <context>
-    <name>TagFilter</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="537"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="537"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="582"/>
-        <source>Tags</source>
-        <translation>Taggar</translation>
-    </message>
-</context>
-<context>
-    <name>TagFilterModel</name>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/filtermodels.cpp" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/filtermodels.cpp" line="359"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/filtermodels.cpp" line="359"/>
-        <source>Empty tags</source>
-        <translation>Tomma taggar</translation>
-    </message>
-</context>
-<context>
     <name>TankInfoModel</name>
     <message>
         <location filename="../qt-models/tankinfomodel.cpp" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/tankinfomodel.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/tankinfomodel.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/tankinfomodel.cpp" line="92"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
         <location filename="../qt-models/tankinfomodel.cpp" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/tankinfomodel.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/tankinfomodel.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/tankinfomodel.cpp" line="92"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
         <location filename="../qt-models/tankinfomodel.cpp" line="87"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/tankinfomodel.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/tankinfomodel.cpp" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/tankinfomodel.cpp" line="92"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -15015,189 +9186,126 @@ mixas av luft och:
     <name>TemplateEdit</name>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="454"/>
         <source>Edit template</source>
         <translation>Ändra mall</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="37"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="455"/>
         <source>Preview</source>
         <translation>Förhandsvisning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="94"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="473"/>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="104"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="457"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="112"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="112"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="458"/>
         <source>Arial</source>
         <translation>Arial</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="117"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="459"/>
         <source>Impact</source>
         <translation>Impact</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="122"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="122"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="460"/>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="127"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="461"/>
         <source>Courier</source>
         <translation>Courier</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="132"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="462"/>
         <source>Verdana</source>
         <translation>Verdana</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="144"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="464"/>
         <source>Font size</source>
         <translation>Fontstorlek</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="165"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="465"/>
         <source>Color palette</source>
         <translation>Färgpalett</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="173"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="173"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="466"/>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="178"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="178"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="178"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="178"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="467"/>
         <source>Almond</source>
         <translation>Mandel</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="183"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="183"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="468"/>
         <source>Shades of blue</source>
         <translation>Nyanser av blått</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="188"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="188"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="469"/>
         <source>Custom</source>
         <translation>Anpassad</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="200"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="471"/>
         <source>Line spacing</source>
         <translation>Radavstånd</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="227"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="472"/>
         <source>Border width</source>
         <translation>Kantbredd</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="271"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="271"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="474"/>
         <source>Template</source>
         <translation>Mall</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="294"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="493"/>
         <source>Colors</source>
         <translation>Färger</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="310"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="475"/>
         <source>Background</source>
         <translation>Bakgrund</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="323"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="476"/>
         <source>color1</source>
         <translation>färg1</translation>
@@ -15209,24 +9317,6 @@ mixas av luft och:
         <location filename="../desktop-widgets/templateedit.ui" line="453"/>
         <location filename="../desktop-widgets/templateedit.ui" line="493"/>
         <location filename="../desktop-widgets/templateedit.ui" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="453"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="493"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="453"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="493"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="453"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="493"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="533"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="477"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="480"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="483"/>
@@ -15238,99 +9328,66 @@ mixas av luft och:
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="350"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="350"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="350"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="350"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="478"/>
         <source>Table cells 1</source>
         <translation>Tabell celler 1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="363"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="479"/>
         <source>color2</source>
         <translation>färg2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="390"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="481"/>
         <source>Table cells 2</source>
         <translation>Tabell celler 2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="403"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="482"/>
         <source>color3</source>
         <translation>färg3</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="430"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="430"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="430"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="430"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="484"/>
         <source>Text 1</source>
         <translation>Text 1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="443"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="485"/>
         <source>color4</source>
         <translation>färg4</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="470"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="487"/>
         <source>Text 2</source>
         <translation>Text 2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="483"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="483"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="488"/>
         <source>color5</source>
         <translation>färg5</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="510"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="490"/>
         <source>Borders</source>
         <translation>Kanter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.ui" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.ui" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.ui" line="523"/>
         <location filename="../subsurface/desktop-widgets/ui_templateedit.h" line="491"/>
         <source>color6</source>
         <translation>färg6</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templateedit.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templateedit.cpp" line="142"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templateedit.cpp" line="142"/>
         <source>Do you want to save your changes?</source>
         <translation>Vill du spara dina ändringar?</translation>
     </message>
@@ -15338,10 +9395,7 @@ mixas av luft och:
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="598"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="677"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="677"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="722"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/>
         <source>%1click to visit %2</source>
         <translation>%1klicka för att besöka %2</translation>
     </message>
@@ -15366,9 +9420,6 @@ mixas av luft och:
     <name>ToolTipItem</name>
     <message>
         <location filename="../profile-widget/divetooltipitem.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/divetooltipitem.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/divetooltipitem.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/divetooltipitem.cpp" line="137"/>
         <source>Information</source>
         <translation>Information</translation>
     </message>
@@ -15377,18 +9428,12 @@ mixas av luft och:
     <name>URLDialog</name>
     <message>
         <location filename="../desktop-widgets/urldialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/urldialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/urldialog.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/urldialog.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_urldialog.h" line="57"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/urldialog.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/urldialog.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/urldialog.ui" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/urldialog.ui" line="52"/>
         <location filename="../subsurface/desktop-widgets/ui_urldialog.h" line="58"/>
         <source>Enter URL for media files</source>
         <translation>Ange URL för mediafiler</translation>
@@ -15398,89 +9443,56 @@ mixas av luft och:
     <name>UpdateManager</name>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="59"/>
         <source>Check for updates.</source>
         <translation>Sök efter uppdateringar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="60"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="60"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface kunde inte söka efter uppdateringar.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="65"/>
         <source>The following error occurred:</source>
         <translation>Följande fel inträffade:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="66"/>
         <source>Please check your internet connection.</source>
         <translation>Verifiera att du har en fungerande uppkoppling till internet.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="76"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Du använder dig av den senaste versionen av Subsurface.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="79"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="79"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>En ny version av Subsurface finns tillgänglig.&lt;br/&gt;Klicka på:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; för att ladda ner den.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="85"/>
         <source>A new version of Subsurface is available.</source>
         <translation>En ny version av Subsurface finns tillgänglig.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="86"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Senaste versionen är %1, vänligen se %2 vår nedladdningssida %3 för information om hur du uppdaterar programvaran.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="96"/>
         <source>Newest release version is </source>
         <translation>Senaste versionen är</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="97"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="97"/>
         <source>The server returned the following information:</source>
         <translation>Servern returnerade följande information:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="114"/>
         <source>Subsurface is checking every two weeks if a new version is available. 
 If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>Subsurface kollar varannan vecka om det har kommit en ny version.
@@ -15488,25 +9500,16 @@ Om du inte vill att Subsurface skall göra det, vänligen klicka på Avstå</tra
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="116"/>
         <source>Decline</source>
         <translation>Avstå</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="117"/>
         <source>Accept</source>
         <translation>Acceptera</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/updatemanager.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/updatemanager.cpp" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/updatemanager.cpp" line="119"/>
         <source>Automatic check for updates</source>
         <translation>Sök efter uppdateringar automatiskt</translation>
     </message>
@@ -15515,21 +9518,12 @@ Om du inte vill att Subsurface skall göra det, vänligen klicka på Avstå</tra
     <name>UserManual</name>
     <message>
         <location filename="../desktop-widgets/usermanual.cpp" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usermanual.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usermanual.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usermanual.cpp" line="76"/>
         <source>User manual</source>
         <translation>Användarmanual</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usermanual.cpp" line="75"/>
         <location filename="../desktop-widgets/usermanual.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usermanual.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usermanual.cpp" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usermanual.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usermanual.cpp" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usermanual.cpp" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usermanual.cpp" line="110"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Kan inte hitta manualen för Subsurface</translation>
     </message>
@@ -15538,143 +9532,95 @@ Om du inte vill att Subsurface skall göra det, vänligen klicka på Avstå</tra
     <name>UserSurvey</name>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="192"/>
         <source>User survey</source>
         <translation>Användarundersökning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="168"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="205"/>
         <source>Subsurface user survey</source>
         <translation>Subsurface användarundersökning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="20"/>
-        <location filename="../tmp/Subsurface-4.8.6/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;Vi skulle väldigt gärna vilja lära oss mer om våra användare och era erfarenheter, vad som kan förbättras och hur ni använder programmet. Avsätt gärna en minut och fyll i detta formulär och skicka in det till utvecklarna bakom Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="47"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="47"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="195"/>
         <source>Technical diver</source>
         <translation>Teknisk dykning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="54"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="196"/>
         <source>Recreational diver</source>
         <translation>Sportdykning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="197"/>
         <source>Dive planner</source>
         <translation>Dykplanering</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="82"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="199"/>
         <source>Supported dive computer</source>
         <translation>Kompatibel dykdator</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="89"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="200"/>
         <source>Other software/sources</source>
         <translation>Andra mjukvaror/källor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="96"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="96"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="201"/>
         <source>Manually entering dives</source>
         <translation>Lägger till dyk manuellt</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="103"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="202"/>
         <source>Android/iPhone companion app</source>
         <translation>Android/iPhone mobilapplikation</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="117"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="203"/>
         <source>Any suggestions? (in English)</source>
         <translation>Har du några förslag? (skriv på engelska)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="127"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.ui" line="127"/>
         <location filename="../subsurface/desktop-widgets/ui_usersurvey.h" line="204"/>
         <source>The following information about your system will also be submitted.</source>
         <translation>Följande information om ditt system kommer även att skickas </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Vilken typ av dykning håller du på med?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.ui" line="75"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Var importerar du dykinformation från?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="19"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="19"/>
         <source>Send</source>
         <translation>Skicka</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="44"/>
         <source>
 Operating system: %1</source>
         <translation>
@@ -15682,9 +9628,6 @@ Operativsystem: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="46"/>
         <source>
 CPU architecture: %1</source>
         <translation>
@@ -15692,9 +9635,6 @@ CPU Arkitektur: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="48"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="48"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="48"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="48"/>
         <source>
 OS CPU architecture: %1</source>
         <translation>
@@ -15702,9 +9642,6 @@ OS CPU Arkitektur: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="49"/>
         <source>
 Language: %1</source>
         <translation>
@@ -15712,81 +9649,51 @@ Språk: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="80"/>
         <source>Should we ask you later?</source>
         <translation>Ska vi fråga dig senare?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="81"/>
         <source>Don&apos;t ask me again</source>
         <translation>Fråga inte mig igen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask later</source>
         <translation>Fråga senare</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="83"/>
         <source>Ask again?</source>
         <translation>Fråga igen?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="102"/>
         <source>Submit user survey.</source>
         <translation>Skicka in användarundersökningen.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="103"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface kunde inte skicka in användarundersökningen.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="108"/>
         <source>The following error occurred:</source>
         <translation>Följande fel inträffade:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="109"/>
         <source>Please check your internet connection.</source>
         <translation>Verifiera att du har en fungerande uppkoppling till internet.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="118"/>
         <source>Survey successfully submitted.</source>
         <translation>Användarundersökningen har skickats in.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/usersurvey.cpp" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/usersurvey.cpp" line="123"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/usersurvey.cpp" line="123"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Ett fel uppstod vid sökningen efter uppdateringar.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -15795,36 +9702,24 @@ Språk: %1</translation>
     <name>VideoFrameExtractor</name>
     <message>
         <location filename="../core/videoframeextractor.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/videoframeextractor.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/videoframeextractor.cpp" line="93"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/videoframeextractor.cpp" line="93"/>
-        <source>ffmpeg failed to start - video thumbnail creation suspended</source>
-        <translation>Spelning av ffmpeg misslyckades - skapande av videominiatyr uppskjuten</translation>
+        <source>ffmpeg failed to start - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
+        <translation>Start av ffmpeg misslyckades  - skapande av videominiatyr uppskjuten. För att aktivera skapande av videominityrer, ange fungerande exekverbar ffmpeg i inställningar.</translation>
     </message>
     <message>
-        <location filename="../core/videoframeextractor.cpp" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/videoframeextractor.cpp" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/videoframeextractor.cpp" line="99"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/videoframeextractor.cpp" line="99"/>
-        <source>failed waiting for ffmpeg - video thumbnail creation suspended</source>
-        <translation>Misslyckades med att invänta ffmpeg - skapande av videominiatyr uppskjuten</translation>
+        <location filename="../core/videoframeextractor.cpp" line="97"/>
+        <source>Failed waiting for ffmpeg - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
+        <translation>Misslyckades med att invänta ffmpeg  - skapande av videominiatyr uppskjuten. För att aktivera skapande av videominityrer, ange fungerande exekverbar ffmpeg i inställningar.</translation>
     </message>
 </context>
 <context>
     <name>WSInfoModel</name>
     <message>
         <location filename="../qt-models/weightsysteminfomodel.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/weightsysteminfomodel.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/weightsysteminfomodel.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/weightsysteminfomodel.cpp" line="81"/>
         <source>Description</source>
         <translation>Beskrivning</translation>
     </message>
     <message>
         <location filename="../qt-models/weightsysteminfomodel.cpp" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/weightsysteminfomodel.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/weightsysteminfomodel.cpp" line="81"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/weightsysteminfomodel.cpp" line="81"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -15833,89 +9728,59 @@ Språk: %1</translation>
     <name>WebServices</name>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="129"/>
         <source>Web service connection</source>
         <translation>Anslutning till webbtjänst</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="25"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="130"/>
         <source>Status:</source>
         <translation>Status:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="32"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="131"/>
         <source>Enter your ID here</source>
         <translation>Skriv in ditt ID här</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="44"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="132"/>
         <source>Download</source>
         <translation>Ladda ned</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="68"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="133"/>
         <source>User ID</source>
         <translation>Användar-ID</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="85"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="85"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="135"/>
         <source>Save user ID locally?</source>
         <translation>Spara användar-ID lokalt?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="92"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="136"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/webservices.ui" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/webservices.ui" line="106"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/webservices.ui" line="106"/>
         <location filename="../subsurface/desktop-widgets/ui_webservices.h" line="137"/>
         <source>Upload</source>
         <translation>Ladda upp</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="326"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="326"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="326"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="331"/>
         <source>Operation timed out</source>
         <translation>Begäran tog för lång tid</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="347"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="347"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="347"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="352"/>
         <source>Transferring data...</source>
         <translation>Överför data...</translation>
     </message>
@@ -15924,25 +9789,16 @@ Språk: %1</translation>
     <name>WeightModel</name>
     <message>
         <location filename="../qt-models/weightmodel.cpp" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/weightmodel.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/weightmodel.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/weightmodel.cpp" line="14"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <location filename="../qt-models/weightmodel.cpp" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/weightmodel.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/weightmodel.cpp" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/weightmodel.cpp" line="14"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-models/weightmodel.cpp" line="80"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/weightmodel.cpp" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/weightmodel.cpp" line="78"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/weightmodel.cpp" line="78"/>
+        <location filename="../qt-models/weightmodel.cpp" line="71"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Klicka här för att ta bort markerad vikt.</translation>
     </message>
@@ -15950,30 +9806,15 @@ Språk: %1</translation>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2198"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2198"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2198"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2198"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2200"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Den här möjligheten är inte än tillgänglig för denna dykdator dator.</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2195"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/configuredivecomputerthreads.cpp" line="2195"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/configuredivecomputerthreads.cpp" line="2195"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/configuredivecomputerthreads.cpp" line="2195"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2179"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2189"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2197"/>
         <source>Failed!</source>
         <translation>Misslyckad!</translation>
     </message>
@@ -15982,25 +9823,16 @@ Språk: %1</translation>
     <name>YearStatisticsItem</name>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="63"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="63"/>
         <source>min</source>
         <translation>Min</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="63"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="63"/>
         <source>sec</source>
         <translation>sek</translation>
     </message>
@@ -16009,9 +9841,6 @@ Språk: %1</translation>
     <name>YearlyStatisticsModel</name>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="126"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
@@ -16019,17 +9848,11 @@ Språk: %1</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="134"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="129"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="132"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="132"/>
         <source>Duration 
  Total</source>
         <translation>Varaktighet
@@ -16037,9 +9860,6 @@ Total</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="140"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="135"/>
         <source>
 Average</source>
         <translation>Medel
@@ -16047,27 +9867,18 @@ Average</source>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="138"/>
         <source>
 Shortest</source>
         <translation>Kortaste</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="146"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="141"/>
         <source>
 Longest</source>
         <translation>Längsta</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="144"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="144"/>
         <source>Depth (%1)
  Average</source>
         <translation>Djup (%1)
@@ -16084,15 +9895,6 @@ Genomsnitt maximum</translation>
         <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="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="165"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="165"/>
         <source>
 Minimum</source>
         <translation>
@@ -16102,15 +9904,6 @@ Minimum</translation>
         <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="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="150"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="168"/>
         <source>
 Maximum</source>
         <translation>
@@ -16118,9 +9911,6 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="153"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
@@ -16128,9 +9918,6 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="170"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/yearlystatisticsmodel.cpp" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/yearlystatisticsmodel.cpp" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/yearlystatisticsmodel.cpp" line="162"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temp. (%1)
@@ -16146,10 +9933,7 @@ Maximum</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="801"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="800"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="800"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="800"/>
+        <location filename="../core/libdivecomputer.c" line="802"/>
         <source>Error parsing the header</source>
         <translation>Misslyckades läsa sidhuvudet</translation>
     </message>
@@ -16160,19 +9944,7 @@ Maximum</translation>
         <location filename="../core/cochran.c" line="306"/>
         <location filename="../core/cochran.c" line="312"/>
         <location filename="../core/cochran.c" line="382"/>
-        <location filename="../core/libdivecomputer.c" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="311"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="311"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="311"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="243"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deco stop</source>
         <translation>dekostopp</translation>
     </message>
@@ -16180,71 +9952,32 @@ Maximum</translation>
         <location filename="../core/cochran.c" line="333"/>
         <location filename="../core/cochran.c" line="387"/>
         <location filename="../core/import-csv.c" line="680"/>
-        <location filename="../core/libdivecomputer.c" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="675"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="675"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="675"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="245"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>ascent</source>
         <translation>uppstigning</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="339"/>
         <location filename="../core/import-csv.c" line="658"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="653"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="653"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="338"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="653"/>
         <source>battery</source>
         <translation>batteri</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="345"/>
-        <location filename="../core/libdivecomputer.c" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="261"/>
+        <location filename="../core/libdivecomputer.c" line="263"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="350"/>
-        <location filename="../core/libdivecomputer.c" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="349"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="260"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="349"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="260"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="349"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="260"/>
+        <location filename="../core/libdivecomputer.c" line="262"/>
         <source>maxdepth</source>
         <translation>maxdjup</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="355"/>
         <location filename="../core/cochran.c" line="401"/>
-        <location filename="../core/libdivecomputer.c" line="263"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="262"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="262"/>
+        <location filename="../core/libdivecomputer.c" line="264"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
@@ -16253,1482 +9986,831 @@ Maximum</translation>
         <location filename="../core/cochran.c" line="411"/>
         <location filename="../core/cochran.c" line="418"/>
         <location filename="../core/import-csv.c" line="761"/>
-        <location filename="../core/libdivecomputer.c" line="254"/>
-        <location filename="../core/libdivecomputer.c" line="268"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="269"/>
         <location filename="../core/plannernotes.c" line="54"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="756"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="756"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="361"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="417"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="756"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="50"/>
         <source>gaschange</source>
         <translation>gasbyte</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="367"/>
         <location filename="../core/cochran.c" line="406"/>
-        <location filename="../core/libdivecomputer.c" line="245"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="366"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="366"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="244"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="366"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="244"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="376"/>
         <location filename="../core/cochran.c" line="423"/>
-        <location filename="../core/libdivecomputer.c" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="246"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="246"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>ceiling</source>
         <translation>takdjup</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="392"/>
-        <location filename="../core/libdivecomputer.c" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/cochran.c" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/cochran.c" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/cochran.c" line="391"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="248"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>transmitter</source>
         <translation>sändare</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="255"/>
+        <location filename="../core/datatrak.c" line="256"/>
         <source>clear</source>
         <translation>klart</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="258"/>
+        <location filename="../core/datatrak.c" line="259"/>
         <source>misty</source>
         <translation>disigt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="260"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="261"/>
+        <location filename="../core/datatrak.c" line="262"/>
         <source>fog</source>
         <translation>dimma</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="263"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="270"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="264"/>
+        <location filename="../core/datatrak.c" line="265"/>
         <source>rain</source>
         <translation>regn</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="273"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="273"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="267"/>
+        <location filename="../core/datatrak.c" line="268"/>
         <source>storm</source>
         <translation>storm</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="269"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="270"/>
+        <location filename="../core/datatrak.c" line="271"/>
         <source>snow</source>
         <translation>snö</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="289"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="290"/>
+        <location filename="../core/datatrak.c" line="291"/>
         <source>No suit</source>
         <translation>Ingen dräkt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="292"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="299"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="299"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="293"/>
+        <location filename="../core/datatrak.c" line="294"/>
         <source>Shorty</source>
         <translation>Shorty</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="296"/>
+        <location filename="../core/datatrak.c" line="297"/>
         <source>Combi</source>
         <translation>Kombi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="305"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="299"/>
+        <location filename="../core/datatrak.c" line="300"/>
         <source>Wet suit</source>
         <translation>Våtdräkt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="308"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="308"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="302"/>
+        <location filename="../core/datatrak.c" line="303"/>
         <source>Semidry suit</source>
         <translation>Semidrydräkt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="304"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="311"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="311"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="305"/>
+        <location filename="../core/datatrak.c" line="306"/>
         <source>Dry suit</source>
         <translation>Torrdräkt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="365"/>
+        <location filename="../core/datatrak.c" line="365"/>
         <source>no stop</source>
         <translation>inget stopp</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="365"/>
-        <location filename="../core/dive.c" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="31"/>
+        <location filename="../core/datatrak.c" line="367"/>
+        <location filename="../core/tag.c" line="20"/>
         <source>deco</source>
         <translation>deko</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="375"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="369"/>
+        <location filename="../core/datatrak.c" line="369"/>
         <source>single ascent</source>
         <translation>enkel uppstigning</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="369"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="377"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="371"/>
+        <location filename="../core/datatrak.c" line="371"/>
         <source>multiple ascent</source>
         <translation>multipla uppstigningar</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="29"/>
+        <location filename="../core/tag.c" line="18"/>
         <source>fresh</source>
         <translation>färsk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="371"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="373"/>
+        <location filename="../core/datatrak.c" line="373"/>
         <source>fresh water</source>
         <translation>sötvatten</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="373"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="375"/>
+        <location filename="../core/datatrak.c" line="375"/>
         <source>salt water</source>
         <translation>saltvatten</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="394"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="400"/>
+        <location filename="../core/datatrak.c" line="396"/>
         <source>sight seeing</source>
         <translation>sightseeing</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="402"/>
+        <location filename="../core/datatrak.c" line="398"/>
         <source>club dive</source>
         <translation>klubbdyk</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="398"/>
-        <location filename="../core/dive.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="30"/>
+        <location filename="../core/datatrak.c" line="400"/>
+        <location filename="../core/tag.c" line="19"/>
         <source>instructor</source>
         <translation>instruktör</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="406"/>
+        <location filename="../core/datatrak.c" line="402"/>
         <source>instruction</source>
         <translation>undervisning</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="402"/>
-        <location filename="../core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="29"/>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/tag.c" line="18"/>
         <source>night</source>
         <translation>natt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="404"/>
-        <location filename="../core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="416"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="416"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="410"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="27"/>
+        <location filename="../core/datatrak.c" line="406"/>
+        <location filename="../core/tag.c" line="16"/>
         <source>cave</source>
         <translation>grotta</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="406"/>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="26"/>
+        <location filename="../core/datatrak.c" line="408"/>
+        <location filename="../core/tag.c" line="15"/>
         <source>ice</source>
         <translation>is</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="408"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="420"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="420"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="414"/>
+        <location filename="../core/datatrak.c" line="410"/>
         <source>search</source>
         <translation>sök</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="415"/>
-        <location filename="../core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="429"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="429"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="27"/>
+        <location filename="../core/datatrak.c" line="417"/>
+        <location filename="../core/tag.c" line="16"/>
         <source>wreck</source>
         <translation>vrak</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="417"/>
-        <location filename="../core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="431"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="431"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="425"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="28"/>
+        <location filename="../core/datatrak.c" line="419"/>
+        <location filename="../core/tag.c" line="17"/>
         <source>river</source>
         <translation>älv</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="419"/>
-        <location filename="../core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="427"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="25"/>
+        <location filename="../core/datatrak.c" line="421"/>
+        <location filename="../core/tag.c" line="14"/>
         <source>drift</source>
         <translation>ström</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="421"/>
-        <location filename="../core/dive.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="435"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="435"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="429"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="30"/>
+        <location filename="../core/datatrak.c" line="423"/>
+        <location filename="../core/tag.c" line="19"/>
         <source>photo</source>
         <translation>foto</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="437"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="437"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="431"/>
+        <location filename="../core/datatrak.c" line="425"/>
         <source>other</source>
         <translation>Övrigt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="433"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="448"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="448"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="442"/>
+        <location filename="../core/datatrak.c" line="435"/>
         <source>Other activities</source>
         <translation>Andra aktiviteter</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="457"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="472"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="472"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="466"/>
+        <location filename="../core/datatrak.c" line="459"/>
         <source>Datatrak/Wlog notes</source>
         <translation>Datatrak/Wlog anteckningar</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="510"/>
+        <location filename="../core/datatrak.c" line="503"/>
         <source>[Warning] Manual dive # %d
 </source>
         <translation>[Varning] Manuellt dyk # %d
 </translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="536"/>
+        <location filename="../core/datatrak.c" line="529"/>
         <source>[Error] Out of memory for dive %d. Abort parsing.</source>
         <translation>[Fel] Slut på minne för dyk %d. Avbryter bearbetning.</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="575"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="589"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="589"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="583"/>
+        <location filename="../core/datatrak.c" line="577"/>
         <source>[Error] File is not a DataTrak file. Aborted</source>
         <translation>[Fel] Filen är inte av typen DataTrak. Avbryter</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="588"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/datatrak.c" line="602"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/datatrak.c" line="602"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/datatrak.c" line="596"/>
+        <location filename="../core/datatrak.c" line="590"/>
         <source>Error: no dive</source>
         <translation>Fel: inget dyk</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="25"/>
+        <location filename="../core/tag.c" line="14"/>
         <source>boat</source>
         <translation>båt</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="25"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="25"/>
+        <location filename="../core/tag.c" line="14"/>
         <source>shore</source>
         <translation>strand</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="26"/>
+        <location filename="../core/tag.c" line="15"/>
         <source>deep</source>
         <translation>djup</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="26"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="26"/>
+        <location filename="../core/tag.c" line="15"/>
         <source>cavern</source>
         <translation>cavern</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="27"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="27"/>
+        <location filename="../core/tag.c" line="16"/>
         <source>altitude</source>
         <translation>höjd över havet</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="28"/>
+        <location filename="../core/tag.c" line="17"/>
         <source>pool</source>
         <translation>pool</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="28"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="28"/>
+        <location filename="../core/tag.c" line="17"/>
         <source>lake</source>
         <translation>sjö</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="29"/>
+        <location filename="../core/tag.c" line="18"/>
         <source>student</source>
         <translation>elev</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="30"/>
+        <location filename="../core/tag.c" line="19"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="35"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>OC-gas</source>
         <translation>OC-gas</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="35"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>diluent</source>
         <translation>utspädd</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="36"/>
-        <location filename="../core/equipment.c" line="90"/>
-        <location filename="../core/planner.c" line="1158"/>
-        <location filename="../core/planner.c" line="1161"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="1145"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="1148"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="1145"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="1148"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="90"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="1145"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="1148"/>
+        <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"/>
         <source>oxygen</source>
         <translation>syre</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="36"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="35"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="35"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>not used</source>
         <translation>inte använd</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="40"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>Open circuit</source>
         <translation>Öppet system</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="293"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="293"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="293"/>
+        <location filename="../core/units.c" line="14"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="299"/>
         <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="620"/>
-        <location filename="../core/qthelper.cpp" line="812"/>
-        <location filename="../core/qthelper.cpp" line="1250"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="622"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1272"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="622"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1268"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="298"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="69"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="622"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1268"/>
+        <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/dive.c" line="303"/>
-        <location filename="../core/qthelper.cpp" line="623"/>
-        <location filename="../core/qthelper.cpp" line="814"/>
-        <location filename="../core/qthelper.cpp" line="1249"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="625"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="816"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1271"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="625"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="816"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1267"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="302"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="625"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="816"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1267"/>
+        <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/dive.c" line="340"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="339"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="339"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="339"/>
+        <location filename="../core/units.c" line="60"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="345"/>
-        <location filename="../core/qthelper.cpp" line="1273"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1295"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1291"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="344"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1291"/>
+        <location filename="../core/qthelper.cpp" line="1277"/>
+        <location filename="../core/units.c" line="65"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="386"/>
-        <location filename="../core/qthelper.cpp" line="536"/>
-        <location filename="../core/qthelper.cpp" line="551"/>
-        <location filename="../core/qthelper.cpp" line="730"/>
-        <location filename="../core/qthelper.cpp" line="1225"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="538"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="732"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1247"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="538"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="732"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1243"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="385"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="538"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="732"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1243"/>
+        <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/dive.c" line="391"/>
-        <location filename="../core/qthelper.cpp" line="539"/>
-        <location filename="../core/qthelper.cpp" line="553"/>
-        <location filename="../core/qthelper.cpp" line="732"/>
-        <location filename="../core/qthelper.cpp" line="1224"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="555"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1246"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="555"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1242"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="390"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="555"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="734"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1242"/>
+        <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/dive.c" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="413"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="413"/>
+        <location filename="../core/units.c" line="134"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="416"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="415"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="415"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="415"/>
+        <location filename="../core/units.c" line="136"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="421"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="420"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="420"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="420"/>
+        <location filename="../core/units.c" line="141"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="422"/>
+        <location filename="../core/units.c" line="143"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="442"/>
-        <location filename="../core/qthelper.cpp" line="562"/>
-        <location filename="../core/qthelper.cpp" line="572"/>
-        <location filename="../core/qthelper.cpp" line="787"/>
-        <location filename="../core/qthelper.cpp" line="1201"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1223"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1219"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="135"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1219"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="135"/>
+        <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>lbs</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="446"/>
-        <location filename="../core/qthelper.cpp" line="560"/>
-        <location filename="../core/qthelper.cpp" line="570"/>
-        <location filename="../core/qthelper.cpp" line="785"/>
-        <location filename="../core/qthelper.cpp" line="1200"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="129"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="562"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="572"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="787"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1222"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="562"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="572"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="787"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1218"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="445"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="562"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="572"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="787"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1218"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="133"/>
+        <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="677"/>
-        <location filename="../core/equipment.c" line="86"/>
-        <location filename="../core/planner.c" line="1154"/>
-        <location filename="../core/planner.c" line="1157"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelist.c" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="1141"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="1144"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelist.c" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="1141"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="1144"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelist.c" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="86"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="1141"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="1144"/>
+        <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="88"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="88"/>
+        <location filename="../core/equipment.c" line="142"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="175"/>
+        <location filename="../core/equipment.c" line="252"/>
         <source>integrated</source>
         <translation>integrerat</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="176"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="176"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="176"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="176"/>
+        <location filename="../core/equipment.c" line="253"/>
         <source>belt</source>
         <translation>bälte</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="177"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="177"/>
+        <location filename="../core/equipment.c" line="254"/>
         <source>ankle</source>
         <translation>ankel</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="178"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="178"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="178"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="178"/>
+        <location filename="../core/equipment.c" line="255"/>
         <source>backplate</source>
         <translation>ryggplatta</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/equipment.c" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/equipment.c" line="179"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/equipment.c" line="179"/>
+        <location filename="../core/equipment.c" line="256"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/file.c" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/file.c" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/file.c" line="115"/>
+        <location filename="../core/file.c" line="117"/>
         <source>No dives in the input file &apos;%s&apos;</source>
         <translation>Inga dyk i filen &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="334"/>
+        <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="53"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/file.c" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="353"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="494"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="832"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/ostctools.c" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/file.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="353"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="494"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="832"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/ostctools.c" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/file.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="353"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="494"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="832"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/ostctools.c" line="50"/>
+        <location filename="../core/ostctools.c" line="54"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Kunde inte öppna &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/file.c" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/file.c" line="219"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/file.c" line="219"/>
+        <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>Kunde inte öppna CSV-fil %s; använd importera från loggfil i menyn</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/file.c" line="325"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/file.c" line="334"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/file.c" line="334"/>
+        <location filename="../core/file.c" line="337"/>
         <source>Empty file &apos;%s&apos;</source>
         <translation>Tom fil &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="597"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="592"/>
         <source>Poseidon import failed: unable to read &apos;%s&apos;</source>
         <translation>Importeringen från Poseidon misslyckades: kunde inte läsa &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="633"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="628"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="628"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="628"/>
         <source>Mouth piece position OC</source>
         <translation>Bitmunstycke i position OC</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="637"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="632"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="632"/>
         <source>Mouth piece position CC</source>
         <translation>Bitmunstycke i position CC</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="641"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="636"/>
         <source>Mouth piece position unknown</source>
         <translation>Bitmunstycke i position okänd</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="645"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="640"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="640"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="640"/>
         <source>Mouth piece position not connected</source>
         <translation>Bitmunstycke i position, ingen kontakt</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="652"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="647"/>
         <source>Power off</source>
         <translation>Ström av</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="702"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="697"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="697"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="697"/>
         <source>O₂ calibration failed</source>
         <translation>O₂ kalibrering misslyckades</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="704"/>
         <location filename="../core/import-csv.c" line="713"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="708"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="708"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="708"/>
         <source>O₂ calibration</source>
         <translation>O₂ kalibrering</translation>
     </message>
     <message>
         <location filename="../core/import-csv.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-csv.c" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-csv.c" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-csv.c" line="227"/>
         <source>No dive profile found from &apos;%s&apos;</source>
         <translation>Ingen dykprofil hittades för &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="83"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="82"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="82"/>
+        <location filename="../core/git-access.c" line="85"/>
         <source>Checkout from storage (%lu/%lu)</source>
         <translation>Utcheckning från lagring (%lu/%lu)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="113"/>
+        <location filename="../core/git-access.c" line="116"/>
         <source>Transfer from storage (%d/%d)</source>
         <translation>Flytta från lagringsplats (%d/%d)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="125"/>
+        <location filename="../core/git-access.c" line="128"/>
         <source>Transfer to storage (%d/%d)</source>
         <translation>Flytta till lagringsplats (%d/%d)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="161"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="161"/>
+        <location filename="../core/git-access.c" line="164"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation>Lokal cache katalog %s är trasig - kan inte synkronisera med Subsurface molnlagring</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="185"/>
-        <location filename="../core/git-access.c" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="204"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="204"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="184"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="204"/>
+        <location filename="../core/git-access.c" line="187"/>
+        <location filename="../core/git-access.c" line="207"/>
         <source>Could not update local cache to newer remote data</source>
         <translation>Kunde inte uppdatera lokal cache med nyare extern data</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="198"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="197"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="197"/>
+        <location filename="../core/git-access.c" line="200"/>
         <source>Subsurface cloud storage corrupted</source>
         <translation>Subsurface molnlagringstjänst skadad</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="334"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="333"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="333"/>
+        <location filename="../core/git-access.c" line="336"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
         <translation>Kunde inte uppdatera Subsurface molnlagringstjänst, försök igen senare</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="394"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="393"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="393"/>
+        <location filename="../core/git-access.c" line="396"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
         <translation>Extern lagring och lokal data separerade. Fel: sammanfogning misslyckades (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="424"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="423"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="423"/>
+        <location filename="../core/git-access.c" line="426"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
         <translation>Extern lagring och lokal data separerade. Kan inte kombinera lokala och externa ändringar</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="458"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="457"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="457"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="457"/>
+        <location filename="../core/git-access.c" line="460"/>
         <source>Remote storage and local data diverged</source>
         <translation>Extern lagring och lokal data separerade</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="461"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="460"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="460"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="460"/>
+        <location filename="../core/git-access.c" line="463"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
         <translation>Extern lagring och lokal data separerade. Fel: skrivning av data misslyckades (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="469"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="469"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="469"/>
+        <location filename="../core/git-access.c" line="472"/>
         <source>Problems with local cache of Subsurface cloud data</source>
         <translation>Problem med lokal cache av Subsurface molndata</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="471"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="470"/>
+        <location filename="../core/git-access.c" line="473"/>
         <source>Moved cache data to %s. Please try the operation again.</source>
         <translation>Flyttade cache data till %s. Vänligen försök igen.</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="517"/>
+        <location filename="../core/git-access.c" line="520"/>
         <source>Update local storage to match cloud storage</source>
         <translation>Uppdatera lokal lagring att matcha molnlagring</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="526"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="525"/>
+        <location filename="../core/git-access.c" line="528"/>
         <source>Push local changes to cloud storage</source>
         <translation>Skicka lokala förändringar till molnlagringstjänsten</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="544"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="543"/>
+        <location filename="../core/git-access.c" line="546"/>
         <source>Try to merge local changes into cloud storage</source>
         <translation>Försöker sammanfoga lokala förändringar i molnlagringsmiljön</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="585"/>
+        <location filename="../core/git-access.c" line="588"/>
         <source>Store data into cloud storage</source>
         <translation>Spara till molnlagring</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="610"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="609"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="609"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="609"/>
+        <location filename="../core/git-access.c" line="612"/>
         <source>Sync with cloud storage</source>
         <translation>Synkronisera med molnlagringstjänst</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="637"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="636"/>
+        <location filename="../core/git-access.c" line="639"/>
         <source>Can&apos;t reach cloud server, working with local data</source>
         <translation>Kan inte ansluta till molnlagringstjänsten, arbetar med data lokalt</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="650"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="649"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="649"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="649"/>
+        <location filename="../core/git-access.c" line="652"/>
         <source>Successful cloud connection, fetch remote</source>
         <translation>Lyckades med anslutning till molntjänsten</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="669"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="668"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="668"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="668"/>
+        <location filename="../core/git-access.c" line="671"/>
         <source>Done syncing with cloud storage</source>
         <translation>Klar med synkronisering till molnlagringstjänsten</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="804"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="803"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="803"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="803"/>
+        <location filename="../core/git-access.c" line="806"/>
         <source>Error connecting to Subsurface cloud storage</source>
         <translation>Fel på uppkopplingen mot molnlagringstjänsten för Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="807"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="806"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="806"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="806"/>
+        <location filename="../core/git-access.c" line="809"/>
         <source>git clone of %s failed (%s)</source>
         <translation>git clone av %s misslyckades (%s)</translation>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="833"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/git-access.c" line="832"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/git-access.c" line="832"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/git-access.c" line="832"/>
+        <location filename="../core/git-access.c" line="835"/>
         <source>Synchronising data file</source>
         <translation>Synkroniserar datafil</translation>
     </message>
     <message>
-        <location filename="../core/import-divinglog.c" line="315"/>
-        <location filename="../core/libdivecomputer.c" line="230"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="30"/>
-        <location filename="../core/uemis-downloader.c" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/import-divinglog.c" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurface-qt/DiveObjectHelper.cpp" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/import-divinglog.c" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurface-qt/DiveObjectHelper.cpp" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="194"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/import-divinglog.c" line="315"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurface-qt/DiveObjectHelper.cpp" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="194"/>
+        <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/uemis-downloader.c" line="199"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="242"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="242"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>none</source>
         <translation>inget</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="248"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="247"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="247"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>workload</source>
         <translation>arbetsbelastning</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="249"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="249"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>violation</source>
         <translation>kränkning</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="251"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="250"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>bookmark</source>
         <translation>bokmärke</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="251"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="251"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="251"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>surface</source>
         <translation>ytan</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="252"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>safety stop</source>
         <translation>säkerhetsstopp</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="254"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>safety stop (voluntary)</source>
         <translation>säkerhetsstopp (frivilligt)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="257"/>
         <source>safety stop (mandatory)</source>
         <translation>säkerhetsstopp (obligatoriskt)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="256"/>
+        <location filename="../core/libdivecomputer.c" line="258"/>
         <source>deepstop</source>
         <translation>djupstopp</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="258"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="257"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="257"/>
+        <location filename="../core/libdivecomputer.c" line="259"/>
         <source>ceiling (safety stop)</source>
         <translation>taket (säkerhetsstopp)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="258"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="258"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="258"/>
+        <location filename="../core/libdivecomputer.c" line="260"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>under golv</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="260"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="259"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="259"/>
+        <location filename="../core/libdivecomputer.c" line="261"/>
         <source>divetime</source>
         <translation>dyktid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="263"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="263"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="263"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>airtime</source>
         <translation>gastid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="264"/>
+        <location filename="../core/libdivecomputer.c" line="266"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="265"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="265"/>
+        <location filename="../core/libdivecomputer.c" line="267"/>
         <source>heading</source>
         <translation>riktning</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="266"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="266"/>
+        <location filename="../core/libdivecomputer.c" line="268"/>
         <source>tissue level warning</source>
         <translation>varning vävnadsnivå</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="277"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="276"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="276"/>
+        <location filename="../core/libdivecomputer.c" line="278"/>
         <source>invalid event number</source>
         <translation>ogiltigt händelsenummer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="613"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="612"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="612"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="612"/>
+        <location filename="../core/libdivecomputer.c" line="614"/>
         <source>Error parsing the datetime</source>
         <translation>Fel vid avläsning av datum och tid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="631"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="630"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="630"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="630"/>
+        <location filename="../core/libdivecomputer.c" line="632"/>
         <source>Dive %d: %s</source>
         <translation>Dyk #%d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="637"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="636"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="636"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error parsing the divetime</source>
         <translation>Fel vid avläsning av dyktid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="646"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="646"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="646"/>
+        <location filename="../core/libdivecomputer.c" line="648"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fel vid avläsning av maxdjup</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="661"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="660"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="660"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="660"/>
+        <location filename="../core/libdivecomputer.c" line="662"/>
         <source>Error parsing temperature</source>
         <translation>Fel vid avläsning av temperatur</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="680"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="679"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="679"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="679"/>
+        <location filename="../core/libdivecomputer.c" line="681"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fel vid avläsning av antalet gasblandningar</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="691"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="690"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="690"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="690"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error obtaining water salinity</source>
         <translation>Fel vid avläsning av vattnets salthalt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="700"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="699"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="699"/>
+        <location filename="../core/libdivecomputer.c" line="701"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fel vid avläsning av tryck vid ytan</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="722"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="722"/>
+        <location filename="../core/libdivecomputer.c" line="724"/>
         <source>Error obtaining dive mode</source>
         <translation>Fel vid avläsning av dykläge</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="745"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="744"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="744"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="744"/>
+        <location filename="../core/libdivecomputer.c" line="746"/>
         <source>Error parsing the gas mix</source>
         <translation>Fel vid avläsning av gasblandning</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="771"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="770"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="770"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="770"/>
+        <location filename="../core/libdivecomputer.c" line="772"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Kan inte skapa parser för %s %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="777"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="776"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="776"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="776"/>
+        <location filename="../core/libdivecomputer.c" line="778"/>
         <source>Error registering the data</source>
         <translation>Fel vid registrering av data</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="808"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="807"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="807"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="807"/>
+        <location filename="../core/libdivecomputer.c" line="809"/>
         <source>Error parsing the samples</source>
         <translation>Kunde inte tolka sampel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="815"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="814"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="814"/>
+        <location filename="../core/libdivecomputer.c" line="816"/>
         <source>Already downloaded dive at %s</source>
         <translation>Dyk %s är redan nerladdat</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1057"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1063"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1063"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1063"/>
         <source>Event: waiting for user action</source>
         <translation>Händelse: väntar på användaren</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1079"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1082"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1085"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1085"/>
         <source>model=%s firmware=%u serial=%u</source>
         <translation>modell=%s firmware=%u serienummer=%u</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1145"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1148"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1151"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1151"/>
         <source>Error registering the event handler.</source>
         <translation>Fel vid registrering av &quot;event handler&quot;.</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1150"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1153"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1156"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1156"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fel vid registrering av &quot;cancellation handler&quot;</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1171"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1174"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1177"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1177"/>
         <source>Dive data import error</source>
         <translation>Misslyckades med importeringen av dykdata</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1358"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1361"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1364"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1364"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan inte skapa libdivecomputer context</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1367"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1370"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1373"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1373"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Kunde inte öppna fil %s %s (%s)</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1378"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1381"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1384"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1384"/>
         <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>Fel uppstod vid öppning av enhet %s %s (%s).
@@ -17736,9 +10818,6 @@ För att felsöka problemet kan det vara bra att skicka loggfiler till utvecklar
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1380"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1383"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1386"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1386"/>
         <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>
@@ -17748,81 +10827,48 @@ Du kan skapa en sådan loggfil genom att välja motsvarande kryssruta i dialogf�
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1388"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/libdivecomputer.c" line="1391"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/libdivecomputer.c" line="1394"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/libdivecomputer.c" line="1394"/>
         <source>No new dives downloaded from dive computer</source>
         <translation>Inga nya dyk att ladda ner från dykdator</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="174"/>
-        <location filename="../core/parse-xml.c" line="1206"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/load-git.c" line="169"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/parse-xml.c" line="1205"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/load-git.c" line="169"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/parse-xml.c" line="1205"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/load-git.c" line="169"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/parse-xml.c" line="1205"/>
+        <location filename="../core/load-git.c" line="186"/>
+        <location filename="../core/parse-xml.c" line="1208"/>
         <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation>multipla GPS-positioner för denna dykplats; även %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="200"/>
-        <location filename="../core/parse.c" line="447"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/load-git.c" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/parse.c" line="446"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/load-git.c" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/parse.c" line="447"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/load-git.c" line="196"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/parse.c" line="447"/>
+        <location filename="../core/load-git.c" line="211"/>
+        <location filename="../core/parse.c" line="443"/>
         <source>additional name for site: %s
 </source>
         <translation>alternativt namn för platsen: %s
 </translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1663"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/load-git.c" line="1668"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/load-git.c" line="1668"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/load-git.c" line="1668"/>
+        <location filename="../core/load-git.c" line="1659"/>
         <source>Load dives from local cache</source>
         <translation>Dyk ladade från lokal buffert</translation>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1667"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/load-git.c" line="1672"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/load-git.c" line="1672"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/load-git.c" line="1672"/>
+        <location filename="../core/load-git.c" line="1663"/>
         <source>Successfully opened dive data</source>
         <translation>Lyckades med att öppna dykdata</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="128"/>
-        <location filename="../core/ostctools.c" line="159"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/ostctools.c" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/ostctools.c" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/ostctools.c" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/ostctools.c" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/ostctools.c" line="125"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/ostctools.c" line="156"/>
+        <location filename="../core/ostctools.c" line="129"/>
+        <location filename="../core/ostctools.c" line="160"/>
         <source>Unknown DC in dive %d</source>
         <translation>Okänd dykdator i dyk %d</translation>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="171"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/ostctools.c" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/ostctools.c" line="168"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/ostctools.c" line="168"/>
+        <location filename="../core/ostctools.c" line="172"/>
         <source>Error - %s - parsing dive %d</source>
         <translation>Fel - %s - vid läsning av dyk %d</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/parse-xml.c" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/parse-xml.c" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/parse-xml.c" line="399"/>
+        <location filename="../core/parse-xml.c" line="401"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Konstig procentuell läsning %s
@@ -17830,32 +10876,16 @@ Du kan skapa en sådan loggfil genom att välja motsvarande kryssruta i dialogf�
     </message>
     <message>
         <location filename="../core/parse-xml.c" line="1663"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/parse-xml.c" line="1661"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/parse-xml.c" line="1661"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/parse-xml.c" line="1661"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Kunde inte läsa &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../core/parse-xml.c" line="2256"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/parse-xml.c" line="2251"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/parse-xml.c" line="2251"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/parse-xml.c" line="2251"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Kan inte öppna formatmall %s</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="115"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="115"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>VARNING: DET HÄR ÄR EN NY IMPLEMENTATION AV %s ALGORITMEN I DYKPLANERAREN. DEN HAR BARA FÅTT EN BEGRÄNSAD MÄNGD TESTNING. VI REKOMMENDERAR STARKT ATT INTE PLANERA DYK ENBART BASERADE PÅ RESULTAT SOM GES HÄR.</translation>
-    </message>
-    <message>
         <location filename="../core/plannernotes.c" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="109"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="109"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Dekompressionsberäkningarna avbröts för de tog för lång tid</translation>
     </message>
@@ -17867,247 +10897,139 @@ Du kan skapa en sådan loggfil genom att välja motsvarande kryssruta i dialogf�
         <location filename="../core/plannernotes.c" line="551"/>
         <location filename="../core/plannernotes.c" line="585"/>
         <location filename="../core/plannernotes.c" line="596"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="464"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="509"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="576"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="587"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="464"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="509"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="576"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="587"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="108"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="464"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="470"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="509"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="576"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="587"/>
         <source>Warning:</source>
         <translation>Varning:</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="416"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="409"/>
         <source>, effective GF=%d/%d</source>
         <translation>, effektiv GF=%d/%d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="306"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="192"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="204"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="204"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="306"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="205"/>
+        <location filename="../core/planner.c" line="300"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="194"/>
         <source>SP change</source>
         <translation>SP ändring</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="102"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="98"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="98"/>
         <source>VPM-B</source>
         <translation>VPM-B</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="100"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="100"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="100"/>
         <source>BUHLMANN</source>
         <translation>BUHLMANN</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="152"/>
         <source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
         <translation>Körtid: %dmin&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="160"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="156"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="156"/>
         <source>depth</source>
         <translation>djup</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="158"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="158"/>
         <source>duration</source>
         <translation>varaktighet</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="53"/>
         <location filename="../core/plannernotes.c" line="164"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="160"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="160"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="160"/>
         <source>runtime</source>
         <translation>körtid</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="166"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="162"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="48"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="48"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="48"/>
         <source>Isobaric counterdiffusion information</source>
         <translation>Information isobar motdiffusion</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="51"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="51"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="51"/>
         <source>&amp;#916;He</source>
         <translation>&amp;#916;He</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="52"/>
         <source>&amp;#916;N&amp;#8322;</source>
         <translation>&amp;#916;N&amp;#8322;</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="53"/>
         <source>max &amp;#916;N&amp;#8322;</source>
         <translation>max &amp;#916;N&amp;#8322;</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="297"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="290"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="290"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="290"/>
         <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"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="299"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="299"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="294"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="299"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="372"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="365"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Byt gas till %s (SP = %.1fbar)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="374"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="367"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="367"/>
         <source>Switch gas to %s</source>
         <translation>Byt gas till %s</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="403"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="396"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="397"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="397"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="397"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="405"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="405"/>
         <source>Deco model: VPM-B at nominal conservatism</source>
         <translation>Dekomodell: VPM-B med nominell konservatism</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="505"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="496"/>
         <source>Minimum gas</source>
         <translation>Minsta gasmängd</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="497"/>
         <source>based on</source>
         <translation>baserad på</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="508"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="499"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="499"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="499"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="518"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="518"/>
         <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 av &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="532"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="523"/>
         <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 av &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s under planerad uppstigning)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="526"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="526"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="526"/>
         <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 av &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt;</translation>
     </message>
@@ -18115,39 +11037,21 @@ Du kan skapa en sådan loggfil genom att välja motsvarande kryssruta i dialogf�
         <location filename="../core/plannernotes.c" line="128"/>
         <location filename="../core/plannernotes.c" line="135"/>
         <location filename="../core/plannernotes.c" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="139"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="131"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="139"/>
         <source>Subsurface</source>
         <translation>Subsurface</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="141"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="141"/>
         <source>dive plan&lt;/b&gt; (surface interval </source>
         <translation>dykplan&lt;/b&gt; (ytintervall</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="147"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="143"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="143"/>
         <source>created on</source>
         <translation>skapad</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="133"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="133"/>
         <source>dive plan&lt;/b&gt; created on</source>
         <translation>dykplan&lt;/b&gt; skapad</translation>
     </message>
@@ -18158,213 +11062,129 @@ Du kan skapa en sådan loggfil genom att välja motsvarande kryssruta i dialogf�
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="130"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="126"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="126"/>
         <source>dive plan&lt;/b&gt; (overlapping dives detected)</source>
         <translation>dykplan&lt;/b&gt; (överlappande dyk upptäckt)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="153"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="149"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="149"/>
         <source>Runtime: %dmin%s</source>
         <translation>Körtid: %dmin%2</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="213"/>
         <source>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>%s till %.*f %s på %d:%02d min - körtid %d:%02u med %s (SP = %.1fbar)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="221"/>
         <location filename="../core/plannernotes.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="222"/>
         <source>Ascend</source>
         <translation>Uppstigning</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="221"/>
         <location filename="../core/plannernotes.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="214"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="222"/>
         <source>Descend</source>
         <translation>Nedstigning</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="221"/>
         <source>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>%s till %.*f %s på %d:%02d min - körtid %d:%02u med %s</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="236"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="236"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="236"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar CCR)</source>
         <translation>Stanna vid %.*f %s under %d:%02d min - körtid %d:%02u med %s (SP = %.1fbar CCR)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="250"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="243"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="243"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s %s</source>
         <translation>Stanna vid %.*f %s under %d:%02d min - körtid %d:%02u med %s %s</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="316"/>
         <location filename="../core/plannernotes.c" line="339"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="309"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="309"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="309"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="332"/>
         <source>(SP = %.1fbar CCR)</source>
         <translation>(SP = %.1fbar CCR)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="402"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="402"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="402"/>
         <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source>
         <translation>Dekomodell: Bühlmann ZHL-16C med GFlow = %d%% och GFhigh = %d%%</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="414"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="407"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="407"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="407"/>
         <source>Deco model: VPM-B at +%d conservatism</source>
         <translation>Dekomodell: VPM-B med +%d konservatism</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="418"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="411"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="411"/>
         <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source>
         <translation>Dekomodell: Sportdykarversion baserad på Bühlmann ZHL-16B med GFlow = %d%% och GFhigh = %d%%</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="426"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="419"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="419"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="419"/>
         <source>ATM pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</source>
         <translation>ATM tryck: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="441"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="434"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="434"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gasförbrukning (CCR-delar exkluderade):</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="443"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="436"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="436"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="436"/>
         <source>Gas consumption (based on SAC</source>
         <translation>Gasförbrukning (baserad på SAC</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="474"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="465"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="465"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="465"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>det här är mer gas än vad som finns tillgängligt i angiven flaska!</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="480"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="471"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="471"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="471"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>inte nog med reserver för att kunna dela gas under uppstigningen!</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="510"/>
         <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source>
         <translation>Nödvändig gas för uppstigning överstiger starttrycket av flaskan!</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="524"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="515"/>
         <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 av &lt;span style=&apos;color: red;&apos;&gt;&lt;b&gt;%s&lt;/b&gt;&lt;/span&gt; (%.0f%s/%.0f%s i planerad uppstigning)</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="543"/>
         <source>Isobaric counterdiffusion conditions exceeded</source>
         <translation>Tillstånd för isobar motdiffusion (ICD) har överskridits</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="574"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="574"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>högt pO₂ %.2f vid %d:%02u med gas %s på djup %.*f %s</translation>
     </message>
     <message>
         <location filename="../core/plannernotes.c" line="594"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="585"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="585"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>lågt pO₂ värde %.2f vid %d:%02u med gas %s på djup %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="881"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="877"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="877"/>
+        <location filename="../core/planner.c" line="900"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Kan inte hitta gas %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1162"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/planner.c" line="1149"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/planner.c" line="1149"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/planner.c" line="1149"/>
+        <location filename="../core/planner.c" line="1183"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1397"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1393"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1391"/>
+        <location filename="../core/profile.c" line="1406"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -18373,139 +11193,91 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1408"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1404"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1404"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1402"/>
+        <location filename="../core/profile.c" line="1417"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1414"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1410"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1410"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1408"/>
+        <location filename="../core/profile.c" line="1423"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1417"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1413"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1413"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1411"/>
+        <location filename="../core/profile.c" line="1426"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1419"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1415"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1415"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1413"/>
+        <location filename="../core/profile.c" line="1428"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1417"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1417"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1415"/>
-        <source>pO%s: %.2fbar
-</source>
-        <translation>pO%s: %.2fbar
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1419"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1419"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1417"/>
-        <source>pN%s: %.2fbar
-</source>
-        <translation>pN%s: %.2fbar
-</translation>
-    </message>
-    <message>
-        <location filename="../core/profile.c" line="1428"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1421"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1421"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1419"/>
+        <location filename="../core/profile.c" line="1437"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1431"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1424"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1424"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1422"/>
+        <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="1471"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1464"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1464"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1462"/>
+        <location filename="../core/profile.c" line="1480"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1463"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1456"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1456"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1454"/>
+        <location filename="../core/profile.c" line="1472"/>
         <source>Safety stop: %umin @ %.0f%s
 </source>
         <translation>Säkerhetsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1404"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1400"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1400"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1398"/>
+        <location filename="../core/profile.c" line="1413"/>
         <source>P: %d%s (%s)
 </source>
         <translation>P: %d%s (%s)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1421"/>
+        <location filename="../core/profile.c" line="1430"/>
         <source>pO₂: %.2fbar
 </source>
         <translation>pO₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1423"/>
+        <location filename="../core/profile.c" line="1432"/>
         <source>SCR ΔpO₂: %.2fbar
 </source>
         <translation>SCR ΔpO₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1426"/>
+        <location filename="../core/profile.c" line="1435"/>
         <source>pN₂: %.2fbar
 </source>
         <translation>pN₂: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1440"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1433"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1433"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1431"/>
+        <location filename="../core/profile.c" line="1449"/>
         <source>EAD: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -18514,10 +11286,7 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1446"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1439"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1439"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1437"/>
+        <location filename="../core/profile.c" line="1455"/>
         <source>END: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
@@ -18526,935 +11295,567 @@ EADD: %d%s / %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1451"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1444"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1444"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1442"/>
+        <location filename="../core/profile.c" line="1460"/>
         <source>Density: %.1fg/ℓ
 </source>
         <translation>Densitet: %.1fg/ℓ
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1466"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1459"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1459"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1457"/>
+        <location filename="../core/profile.c" line="1475"/>
         <source>Safety stop: unknown time @ %.0f%s
 </source>
         <translation>Säkerhetsstopp: okänd tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1474"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1467"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1467"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1465"/>
+        <location filename="../core/profile.c" line="1483"/>
         <source>Deco: unknown time @ %.0f%s
 </source>
         <translation>Deko: okänd tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1478"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1471"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1471"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1469"/>
+        <location filename="../core/profile.c" line="1487"/>
         <source>In deco
 </source>
         <translation>I Deko
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1480"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1473"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1473"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1471"/>
+        <location filename="../core/profile.c" line="1489"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1483"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1476"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1476"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1474"/>
+        <location filename="../core/profile.c" line="1492"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1486"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1479"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1479"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1477"/>
+        <location filename="../core/profile.c" line="1495"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (beräknad)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1494"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1487"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1487"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1485"/>
+        <location filename="../core/profile.c" line="1503"/>
         <source>In deco (calc)
 </source>
         <translation>I deko (beräknad)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1497"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1490"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1490"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1488"/>
+        <location filename="../core/profile.c" line="1506"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (beräknad)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1499"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1492"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1492"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1490"/>
+        <location filename="../core/profile.c" line="1508"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (beräknad)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1503"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1496"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1496"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1494"/>
+        <location filename="../core/profile.c" line="1512"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (beräknad)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1505"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1498"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1498"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1496"/>
+        <location filename="../core/profile.c" line="1514"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (beräknad)
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1508"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1501"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1501"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1499"/>
+        <location filename="../core/profile.c" line="1517"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1511"/>
+        <location filename="../core/profile.c" line="1520"/>
         <source>Surface GF %.0f%%
 </source>
         <translation>Ytan GF %.0f%%
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1514"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1504"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1504"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1502"/>
+        <location filename="../core/profile.c" line="1523"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Beräknat takdjup %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1520"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1510"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1510"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1508"/>
+        <location filename="../core/profile.c" line="1529"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Vävnad %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1527"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1516"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1516"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1514"/>
+        <location filename="../core/profile.c" line="1536"/>
         <source>ICD in leading tissue
 </source>
         <translation>ICD i ledande vävnad
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1529"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1518"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1518"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1516"/>
+        <location filename="../core/profile.c" line="1538"/>
         <source>heart rate: %d
 </source>
         <translation>hjärtrytm: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1531"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1520"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1520"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1518"/>
+        <location filename="../core/profile.c" line="1540"/>
         <source>bearing: %d
 </source>
         <translation>kurs: %d
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1534"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1523"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1523"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1521"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>mean depth to here %.1f%s
 </source>
-        <translation>Medeldjup till position %.1f%s
+        <translation>Medeldjup fram till markör %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1631"/>
+        <location filename="../core/profile.c" line="1640"/>
         <source>ΔT:%d:%02dmin</source>
         <translation>ΔT:%d:%02dmin</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1635"/>
+        <location filename="../core/profile.c" line="1644"/>
         <source>%s ΔD:%.1f%s</source>
         <translation>%s ΔD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1639"/>
+        <location filename="../core/profile.c" line="1648"/>
         <source>%s ↓D:%.1f%s</source>
         <translation>%s ↓D:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1643"/>
+        <location filename="../core/profile.c" line="1652"/>
         <source>%s ↑D:%.1f%s</source>
         <translation>%s ↑D:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1647"/>
+        <location filename="../core/profile.c" line="1656"/>
         <source>%s øD:%.1f%s
 </source>
         <translation>%s øD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1651"/>
+        <location filename="../core/profile.c" line="1660"/>
         <source>%s ↓V:%.2f%s</source>
         <translation>%s ↓V:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1655"/>
+        <location filename="../core/profile.c" line="1664"/>
         <source>%s ↑V:%.2f%s</source>
         <translation>%s ↑V:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1659"/>
+        <location filename="../core/profile.c" line="1668"/>
         <source>%s øV:%.2f%s</source>
         <translation>%s øV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1666"/>
+        <location filename="../core/profile.c" line="1675"/>
         <source>%s ΔP:%d%s</source>
         <translation>%s ΔP:%d%s</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1620"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1620"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1618"/>
-        <source>%sT:%d:%02dmin</source>
-        <translation>%sT:%d:%02dmin</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1655"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1655"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1653"/>
-        <source>%s %sP:%d%s</source>
-        <translation>%s %sP:%d%s</translation>
-    </message>
-    <message>
-        <location filename="../core/profile.c" line="1691"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1680"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1680"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1678"/>
+        <location filename="../core/profile.c" line="1700"/>
         <source>%s SAC:%.*f%s/min</source>
         <translation>%s SAC:%.*f%s/min</translation>
     </message>
     <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1624"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1628"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1632"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1624"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1628"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1632"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1622"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1626"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1630"/>
-        <source>%s %sD:%.1f%s</source>
-        <translation>%s %sD:%.1f%s</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1636"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1636"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1634"/>
-        <source>%s %sD:%.1f%s
-</source>
-        <translation>%s %sD:%.1f%s
-</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1640"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1640"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1638"/>
-        <source>%s%sV:%.2f%s</source>
-        <translation>%s%sV:%.2f%s</translation>
-    </message>
-    <message>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1644"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/profile.c" line="1648"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1644"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/profile.c" line="1648"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1642"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/profile.c" line="1646"/>
-        <source>%s %sV:%.2f%s</source>
-        <translation>%s %sV:%.2f%s</translation>
-    </message>
-    <message>
-        <location filename="../core/qthelper.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="62"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="62"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="62"/>
+        <location filename="../core/qthelper.cpp" line="70"/>
         <source>%1km</source>
         <translation>%1km</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="64"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="64"/>
+        <location filename="../core/qthelper.cpp" line="72"/>
         <source>%1m</source>
         <translation>%1m</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="72"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="68"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="68"/>
+        <location filename="../core/qthelper.cpp" line="76"/>
         <source>%1mi</source>
         <translation>%1mi</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="70"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="70"/>
+        <location filename="../core/qthelper.cpp" line="78"/>
         <source>%1yd</source>
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="223"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="223"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="223"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="236"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="92"/>
-        <location filename="../core/qthelper.cpp" line="233"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="88"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="224"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="237"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="93"/>
-        <location filename="../core/qthelper.cpp" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="225"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="225"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="225"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="238"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="93"/>
-        <location filename="../core/qthelper.cpp" line="235"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="89"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="226"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="239"/>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="581"/>
-        <location filename="../core/qthelper.cpp" line="758"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="760"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="760"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="583"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="760"/>
+        <location filename="../core/qthelper.cpp" line="585"/>
+        <location filename="../core/qthelper.cpp" line="762"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="584"/>
-        <location filename="../core/qthelper.cpp" line="760"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="762"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="762"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="586"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="762"/>
+        <location filename="../core/qthelper.cpp" line="588"/>
+        <location filename="../core/qthelper.cpp" line="764"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="835"/>
-        <location filename="../core/qthelper.cpp" line="1177"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1199"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1195"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1195"/>
+        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>AIR</source>
         <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="837"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="839"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="839"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="841"/>
         <source>EAN</source>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="912"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="914"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="914"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="914"/>
+        <location filename="../core/qthelper.cpp" line="916"/>
         <source>more than %1 days</source>
         <translation>mer än %1 dagar</translation>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="958"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="977"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="976"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="976"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation><numerusform>(%n dyk)</numerusform><numerusform>(%n dyk)</numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1177"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1199"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1195"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1195"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>OXYGEN</source>
         <translation>SYRE</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1272"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.cpp" line="1294"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.cpp" line="1290"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.cpp" line="1290"/>
+        <location filename="../core/qthelper.cpp" line="1276"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="478"/>
-        <location filename="../core/save-html.c" line="562"/>
-        <location filename="../core/worldmap-save.c" line="114"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="476"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="476"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="113"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="476"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="560"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="113"/>
+        <location filename="../core/save-html.c" line="482"/>
+        <location filename="../core/save-html.c" line="566"/>
+        <location filename="../core/worldmap-save.c" line="116"/>
         <source>Can&apos;t open file %s</source>
         <translation>Kan inte öppna fil %s</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="495"/>
+        <location filename="../core/save-html.c" line="501"/>
         <source>Number</source>
         <translation>Nummer</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="496"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="496"/>
+        <location filename="../core/save-html.c" line="502"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="499"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="497"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="497"/>
+        <location filename="../core/save-html.c" line="503"/>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="498"/>
+        <location filename="../core/save-html.c" line="504"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="499"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="499"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="499"/>
+        <location filename="../core/save-html.c" line="505"/>
         <source>Air temp.</source>
         <translation>Lufttemp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="502"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="500"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="500"/>
+        <location filename="../core/save-html.c" line="506"/>
         <source>Water temp.</source>
         <translation>Vattentemp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="503"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="501"/>
+        <location filename="../core/save-html.c" line="507"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="502"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="502"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="502"/>
+        <location filename="../core/save-html.c" line="508"/>
         <source>Expand all</source>
         <translation>Expandera alla</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="505"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="503"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="503"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="503"/>
+        <location filename="../core/save-html.c" line="509"/>
         <source>Collapse all</source>
         <translation>Sammanslå alla</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="504"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="504"/>
+        <location filename="../core/save-html.c" line="510"/>
         <source>Trips</source>
         <translation>Resor</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="507"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="505"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="505"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="511"/>
         <source>Statistics</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="508"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="506"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="506"/>
+        <location filename="../core/save-html.c" line="512"/>
         <source>Advanced search</source>
         <translation>Avancerad sökning</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="511"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="509"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="509"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="509"/>
+        <location filename="../core/save-html.c" line="515"/>
         <source>Rating</source>
         <translation>Betyg</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="512"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="510"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="510"/>
+        <location filename="../core/save-html.c" line="516"/>
         <source>Visibility</source>
         <translation>Sikt</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="513"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="511"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="511"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="511"/>
+        <location filename="../core/save-html.c" line="517"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="514"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="512"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="512"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="512"/>
+        <location filename="../core/save-html.c" line="518"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="513"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="513"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="513"/>
+        <location filename="../core/save-html.c" line="519"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="514"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="514"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="514"/>
+        <location filename="../core/save-html.c" line="520"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
         <location filename="../core/divesite-helper.cpp" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divesite-helper.cpp" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divesite-helper.cpp" line="21"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divesite-helper.cpp" line="21"/>
         <source>No dive site layout categories set in preferences!</source>
         <translation>Inga kategorier för utforming av dykplatser är konfigurerade i inställningar!</translation>
     </message>
     <message>
         <location filename="../core/divesite-helper.cpp" line="29"/>
-        <location filename="../core/save-html.c" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divesite-helper.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divesite-helper.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divesite-helper.cpp" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="515"/>
+        <location filename="../core/save-html.c" line="521"/>
         <source>Tags</source>
         <translation>Taggar</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="518"/>
-        <location filename="../smtk-import/smartrak.c" line="256"/>
-        <location filename="../smtk-import/smartrak.c" line="329"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="329"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="329"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="516"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="256"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="329"/>
+        <location filename="../core/save-html.c" line="522"/>
+        <location filename="../smtk-import/smartrak.c" line="257"/>
+        <location filename="../smtk-import/smartrak.c" line="330"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="519"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="517"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="517"/>
+        <location filename="../core/save-html.c" line="523"/>
         <source>Show more details</source>
         <translation>Visa mer detaljer</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="522"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="520"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="520"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="520"/>
+        <location filename="../core/save-html.c" line="526"/>
         <source>Yearly statistics</source>
         <translation>Årsstatistik</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="521"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="521"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="521"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Year</source>
         <translation>År</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="524"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="522"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="522"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="522"/>
+        <location filename="../core/save-html.c" line="528"/>
         <source>Total time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="523"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="523"/>
+        <location filename="../core/save-html.c" line="529"/>
         <source>Average time</source>
         <translation>Genomsnittlig tid</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="526"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="524"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="524"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="524"/>
+        <location filename="../core/save-html.c" line="530"/>
         <source>Shortest time</source>
         <translation>Kortaste tid</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="525"/>
+        <location filename="../core/save-html.c" line="531"/>
         <source>Longest time</source>
         <translation>Längsta tid</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="528"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="526"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="526"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="526"/>
+        <location filename="../core/save-html.c" line="532"/>
         <source>Average depth</source>
         <translation>Genomsnittligt djup</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="529"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="527"/>
+        <location filename="../core/save-html.c" line="533"/>
         <source>Min. depth</source>
         <translation>Min. djup</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="530"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="528"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="528"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="528"/>
+        <location filename="../core/save-html.c" line="534"/>
         <source>Max. depth</source>
         <translation>Max. djup</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="531"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="529"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="529"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="529"/>
+        <location filename="../core/save-html.c" line="535"/>
         <source>Average SAC</source>
         <translation>Genomsnittlig SAC</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="532"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="530"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="530"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="530"/>
+        <location filename="../core/save-html.c" line="536"/>
         <source>Min. SAC</source>
         <translation>Min. SAC</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="531"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="531"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="531"/>
+        <location filename="../core/save-html.c" line="537"/>
         <source>Max. SAC</source>
         <translation>Max. SAC</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="534"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="532"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="532"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="532"/>
+        <location filename="../core/save-html.c" line="538"/>
         <source>Average temp.</source>
         <translation>Genomsnittlig temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="533"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="533"/>
+        <location filename="../core/save-html.c" line="539"/>
         <source>Min. temp.</source>
         <translation>Min. temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="536"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="534"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="534"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="534"/>
+        <location filename="../core/save-html.c" line="540"/>
         <source>Max. temp.</source>
         <translation>Max. temp.</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="537"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="535"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="541"/>
         <source>Back to list</source>
         <translation>Tillbaka till listan</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="540"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="538"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="538"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="538"/>
+        <location filename="../core/save-html.c" line="544"/>
         <source>Dive #</source>
         <translation>Dyk #</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="539"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="539"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="539"/>
+        <location filename="../core/save-html.c" line="545"/>
         <source>Dive profile</source>
         <translation>Dykprofil</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="540"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="540"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="540"/>
+        <location filename="../core/save-html.c" line="546"/>
         <source>Dive information</source>
         <translation>Dykinformation</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="541"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="541"/>
+        <location filename="../core/save-html.c" line="547"/>
         <source>Dive equipment</source>
         <translation>Dykutrustning</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="544"/>
-        <location filename="../core/save-html.c" line="551"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="542"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="549"/>
+        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="555"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="545"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="543"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="543"/>
+        <location filename="../core/save-html.c" line="549"/>
         <source>Size</source>
         <translation>Storlek</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="544"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="544"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="544"/>
+        <location filename="../core/save-html.c" line="550"/>
         <source>Work pressure</source>
         <translation>Arbetstryck</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="545"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="545"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="545"/>
+        <location filename="../core/save-html.c" line="551"/>
         <source>Start pressure</source>
         <translation>Starttryck</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="548"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="546"/>
+        <location filename="../core/save-html.c" line="552"/>
         <source>End pressure</source>
         <translation>Sluttryck</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="549"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="547"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="547"/>
+        <location filename="../core/save-html.c" line="553"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="550"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="548"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="548"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="554"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="550"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="550"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="550"/>
+        <location filename="../core/save-html.c" line="556"/>
         <source>Events</source>
         <translation>Händelser</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="551"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="551"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="551"/>
+        <location filename="../core/save-html.c" line="557"/>
         <source>Name</source>
         <translation>Namn</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="554"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="552"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="552"/>
+        <location filename="../core/save-html.c" line="558"/>
         <source>Value</source>
         <translation>Värde</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="555"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="553"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="553"/>
+        <location filename="../core/save-html.c" line="559"/>
         <source>Coordinates</source>
         <translation>Koordinater</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="556"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-html.c" line="554"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-html.c" line="554"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-html.c" line="554"/>
+        <location filename="../core/save-html.c" line="560"/>
         <source>Dive status</source>
         <translation>Dykstatus</translation>
     </message>
     <message>
         <location filename="../core/statistics.c" line="146"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/statistics.c" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/statistics.c" line="136"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/statistics.c" line="136"/>
         <source>All (by type stats)</source>
         <translation>Alla (baserat på typ av dyk)</translation>
     </message>
@@ -19469,138 +11870,87 @@ EADD: %d%s / %.1fg/ℓ
         <translation>Alla (baserat på min. temperatur)</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="41"/>
+        <location filename="../core/dive.c" line="29"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="42"/>
+        <location filename="../core/dive.c" line="30"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/dive.c" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/dive.c" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/dive.c" line="43"/>
+        <location filename="../core/dive.c" line="31"/>
         <source>Freedive</source>
         <translation>Fridykning</translation>
     </message>
     <message>
         <location filename="../core/statistics.c" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/statistics.c" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/statistics.c" line="186"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/statistics.c" line="186"/>
         <source>All (by trip stats)</source>
         <translation>Alla (baserat på resa)</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="113"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jan</source>
         <translation>jan</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="113"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="113"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="113"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="113"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>May</source>
         <translation>maj</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="118"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="113"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurfacestartup.c" line="119"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="29"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="29"/>
+        <location filename="../core/uemis-downloader.c" line="34"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
@@ -19609,10 +11959,7 @@ and click &apos;Retry&apos;</source>
 igen</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="30"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="30"/>
+        <location filename="../core/uemis-downloader.c" line="35"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
@@ -19621,782 +11968,473 @@ and click Retry</source>
 och försök igen</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="33"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="31"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="31"/>
+        <location filename="../core/uemis-downloader.c" line="36"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation>Kunde inte skriva filen req.txt
 Är Uemis Zurich ordentligt ansluten?</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="32"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="32"/>
+        <location filename="../core/uemis-downloader.c" line="37"/>
         <source>No dives to download.</source>
         <translation>Inga dyk att ladda ner</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="498"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="507"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="507"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="507"/>
+        <location filename="../core/uemis-downloader.c" line="501"/>
         <source>%s %s</source>
         <translation>%s %s</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="534"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="527"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="527"/>
+        <location filename="../core/uemis-downloader.c" line="537"/>
         <source>data</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="562"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="555"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="555"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="555"/>
+        <location filename="../core/uemis-downloader.c" line="565"/>
         <source>dive log #</source>
         <translation>dyklogg #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="564"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="557"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="557"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="557"/>
+        <location filename="../core/uemis-downloader.c" line="567"/>
         <source>dive spot #</source>
         <translation>dykplats #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="566"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="559"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="559"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="559"/>
+        <location filename="../core/uemis-downloader.c" line="569"/>
         <source>details for #</source>
         <translation>detaljer för #</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="794"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="789"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>wetsuit</source>
         <translation>våtdräkt</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="794"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="789"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>semidry</source>
         <translation>semidry</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="794"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="789"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>drysuit</source>
         <translation>torrdräkt</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>shorty</source>
         <translation>shorty</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>vest</source>
         <translation>väst</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>long john</source>
         <translation>Longjohn</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>jacket</source>
         <translation>jacka</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>full suit</source>
         <translation>heldräkt</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="790"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>2 pcs full suit</source>
         <translation>tvådelad heldräkt</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="791"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="791"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="791"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>membrane</source>
         <translation>membran</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1335"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="1329"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="1329"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="1329"/>
+        <location filename="../core/uemis-downloader.c" line="1338"/>
         <source>Initialise communication</source>
         <translation>Initialisera kommunikation</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1338"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="1332"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="1332"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="1332"/>
+        <location filename="../core/uemis-downloader.c" line="1341"/>
         <source>Uemis init failed</source>
         <translation>Kunde inte läsa från Uemis</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1350"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis-downloader.c" line="1344"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis-downloader.c" line="1344"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis-downloader.c" line="1344"/>
+        <location filename="../core/uemis-downloader.c" line="1353"/>
         <source>Start download</source>
         <translation>Starta nedladdningen</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="201"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="200"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="200"/>
         <source>Safety stop violation</source>
         <translation>Överträdelse av säkerhetsstopp</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="203"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="202"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="202"/>
         <source>Speed alarm</source>
         <translation>Hastighetslarm</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="205"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="205"/>
         <source>Speed warning</source>
         <translation>Hastighetsvarning</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="208"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="207"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="207"/>
         <source>pO₂ green warning</source>
         <translation>pO₂ grön varning</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="211"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="210"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="210"/>
         <source>pO₂ ascend warning</source>
         <translation>pO₂ uppstigningsvarning</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="213"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="212"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="212"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="212"/>
         <source>pO₂ ascend alarm</source>
         <translation>pO₂ uppstigningshastighet larm</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="217"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="216"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="216"/>
         <source>Tank pressure info</source>
         <translation>Flasktrycksinformation</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="219"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="218"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="218"/>
         <source>RGT warning</source>
         <translation>RGT varning</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="221"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="220"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="220"/>
         <source>RGT alert</source>
         <translation>RGT varsel</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="223"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="222"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="222"/>
         <source>Tank change suggested</source>
         <translation>Flaskbyte föreslagit</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="225"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="224"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="224"/>
         <source>Depth limit exceeded</source>
         <translation>Djupbegränsning passerad</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="227"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="226"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="226"/>
         <source>Max deco time warning</source>
         <translation>Maximal dekotid varning</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="229"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="228"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="228"/>
         <source>Dive time info</source>
         <translation>Dyktidsinformation</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="231"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="230"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="230"/>
         <source>Dive time alert</source>
         <translation>Dyktidsvarning</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="233"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="232"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="232"/>
         <source>Marker</source>
         <translation>markering</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="235"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="234"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="234"/>
         <source>No tank data</source>
         <translation>Ingen flaskinformation</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="237"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="236"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="236"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="236"/>
         <source>Low battery warning</source>
         <translation>Lågt batterivarning</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="239"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/uemis.c" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/uemis.c" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/uemis.c" line="238"/>
         <source>Low battery alert</source>
         <translation>Lågt batteri varsel</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="42"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="41"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="41"/>
+        <location filename="../core/worldmap-save.c" line="44"/>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="44"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="43"/>
+        <location filename="../core/worldmap-save.c" line="46"/>
         <source>Time:</source>
         <translation>Tid:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="45"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="45"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="45"/>
+        <location filename="../core/worldmap-save.c" line="48"/>
         <source>Duration:</source>
         <translation>Varaktighet:</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
+        <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="139"/>
-        <location filename="../core/worldmap-save.c" line="47"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/plannernotes.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurface-qt/DiveObjectHelper.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templatelayout.h" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/plannernotes.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurface-qt/DiveObjectHelper.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templatelayout.h" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/plannernotes.c" line="501"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurface-qt/DiveObjectHelper.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="46"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templatelayout.h" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="107"/>
+        <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="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="139"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="100"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="103"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/subsurface-qt/DiveObjectHelper.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templatelayout.h" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/subsurface-qt/DiveObjectHelper.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templatelayout.h" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="107"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/subsurface-qt/DiveObjectHelper.cpp" line="137"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templatelayout.h" line="110"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="107"/>
+        <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="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/qthelper.h" line="76"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/qthelper.h" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/templatelayout.h" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/qthelper.h" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/templatelayout.h" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/qthelper.h" line="76"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/templatelayout.h" line="111"/>
+        <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>sek</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="152"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/divelogexportlogic.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/divelogexportlogic.cpp" line="154"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/divelogexportlogic.cpp" line="154"/>
+        <location filename="../core/divelogexportlogic.cpp" line="153"/>
         <source>Cannot find a folder called &apos;theme&apos; in the standard locations</source>
         <translation>Kan inte hitta en mapp med namn &apos;theme&apos; på standardplatsen</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="50"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="49"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="49"/>
+        <location filename="../core/worldmap-save.c" line="52"/>
         <source>Max. depth:</source>
         <translation>Max. djup:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="53"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="52"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="52"/>
+        <location filename="../core/worldmap-save.c" line="55"/>
         <source>Air temp.:</source>
         <translation>Lufttemp:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="56"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="55"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="55"/>
+        <location filename="../core/worldmap-save.c" line="58"/>
         <source>Water temp.:</source>
         <translation>Vattentemp.:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="58"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="57"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="57"/>
+        <location filename="../core/worldmap-save.c" line="60"/>
         <source>Location:</source>
         <translation>Plats:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="62"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/worldmap-save.c" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/worldmap-save.c" line="61"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/worldmap-save.c" line="61"/>
+        <location filename="../core/worldmap-save.c" line="64"/>
         <source>Notes:</source>
         <translation>Anteckningar:</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="252"/>
+        <location filename="../smtk-import/smartrak.c" line="253"/>
         <source>Built</source>
         <translation>Byggd</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="252"/>
+        <location filename="../smtk-import/smartrak.c" line="253"/>
         <source>Sank</source>
         <translation>Sjönk</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="252"/>
+        <location filename="../smtk-import/smartrak.c" line="253"/>
         <source>Sank Time</source>
         <translation>Nedstigningstid</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="253"/>
+        <location filename="../smtk-import/smartrak.c" line="254"/>
         <source>Reason</source>
         <translation>Anledning</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="253"/>
+        <location filename="../smtk-import/smartrak.c" line="254"/>
         <source>Nationality</source>
         <translation>Nationalitet</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="253"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="253"/>
+        <location filename="../smtk-import/smartrak.c" line="254"/>
         <source>Shipyard</source>
         <translation>Varv</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="254"/>
+        <location filename="../smtk-import/smartrak.c" line="255"/>
         <source>ShipType</source>
         <translation>Skeppstyp</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="254"/>
+        <location filename="../smtk-import/smartrak.c" line="255"/>
         <source>Length</source>
         <translation>Längd</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="254"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="254"/>
+        <location filename="../smtk-import/smartrak.c" line="255"/>
         <source>Beam</source>
         <translation>Bredd</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="255"/>
+        <location filename="../smtk-import/smartrak.c" line="256"/>
         <source>Draught</source>
         <translation>Djupgånde</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="255"/>
+        <location filename="../smtk-import/smartrak.c" line="256"/>
         <source>Displacement</source>
         <translation>Deplacement</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="255"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="255"/>
+        <location filename="../smtk-import/smartrak.c" line="256"/>
         <source>Cargo</source>
         <translation>Last</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="267"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="267"/>
+        <location filename="../smtk-import/smartrak.c" line="268"/>
         <source>Wreck Data</source>
         <translation>Vrakinformation</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="328"/>
+        <location filename="../smtk-import/smartrak.c" line="329"/>
         <source>Altitude</source>
         <translation>Höjd över havet</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.4/smtk-import/smartrak.c" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.5/smtk-import/smartrak.c" line="328"/>
-        <location filename="../tmp/Subsurface-4.8.6/smtk-import/smartrak.c" line="328"/>
+        <location filename="../smtk-import/smartrak.c" line="329"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
         <location filename="../profile-widget/diveprofileitem.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/diveprofileitem.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/diveprofileitem.cpp" line="190"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/diveprofileitem.cpp" line="190"/>
         <source>planned waypoint above ceiling</source>
         <translation>planerat mål ovanför takdjup</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="9"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="9"/>
         <source>None</source>
         <translation>Inget</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="10"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="10"/>
         <source>Ocean</source>
         <translation>Hav</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="11"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="11"/>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="12"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="12"/>
         <source>State</source>
         <translation>Delstat</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="13"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="13"/>
         <source>County</source>
         <translation>Län</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="14"/>
         <source>Town</source>
         <translation>Stad</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/taxonomy.c" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/taxonomy.c" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/taxonomy.c" line="15"/>
         <source>City</source>
         <translation>Storstad</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="913"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-git.c" line="934"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-git.c" line="934"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-git.c" line="934"/>
+        <location filename="../core/save-git.c" line="916"/>
         <source>Start saving data</source>
         <translation>Börja spara data</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="922"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-git.c" line="943"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-git.c" line="943"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-git.c" line="943"/>
+        <location filename="../core/save-git.c" line="925"/>
         <source>Start saving dives</source>
         <translation>Börja spara dyk</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="955"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-git.c" line="976"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-git.c" line="976"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-git.c" line="976"/>
+        <location filename="../core/save-git.c" line="958"/>
         <source>Done creating local cache</source>
         <translation>Färdig med att skapa en lokal buffert</translation>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="1206"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/save-git.c" line="1227"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/save-git.c" line="1227"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/save-git.c" line="1227"/>
+        <location filename="../core/save-git.c" line="1209"/>
         <source>Preparing to save data</source>
         <translation>Förbereder att spara data</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1661"/>
-        <location filename="../tmp/Subsurface-4.8.4/profile-widget/profilewidget2.cpp" line="1666"/>
-        <location filename="../tmp/Subsurface-4.8.5/profile-widget/profilewidget2.cpp" line="1666"/>
-        <location filename="../tmp/Subsurface-4.8.6/profile-widget/profilewidget2.cpp" line="1666"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1658"/>
         <source>modechange</source>
         <translation>Byt läge</translation>
     </message>
     <message>
         <location filename="../core/gpslocation.h" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/core/gpslocation.h" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/core/gpslocation.h" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/core/gpslocation.h" line="14"/>
         <source>Waiting to aquire GPS location</source>
         <translation>Väntar på identifiering av GPS-position</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="66"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/diveplanner.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/diveplanner.cpp" line="65"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/diveplanner.cpp" line="65"/>
         <source>Remove this point</source>
         <translation>Ta bort denna punkt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="556"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/mainwindow.cpp" line="633"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/mainwindow.cpp" line="633"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/mainwindow.cpp" line="569"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="559"/>
         <source>Don&apos;t save an empty log to the cloud</source>
         <translation>Spara inte en tom loggbok till molntjänsten</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="45"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="34"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="35"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/>
         <source>Average</source>
         <translation>Genomsnitt</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="48"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="37"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="38"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
         <source>Minimum</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="51"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/simplewidgets.cpp" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/simplewidgets.cpp" line="40"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/simplewidgets.cpp" line="41"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
         <source>Maximum</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="401"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="401"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="401"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="406"/>
         <source>Invalid response from server</source>
         <translation>Ogiltigt svar från server</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="409"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="414"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Förväntade XML tag &apos;DiveDateReader&apos; men fick istället &apos;%1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="455"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="455"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="455"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="460"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Förväntad XML tagg &apos;DiveDates&apos; gick ej att finna</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/subsurfacewebservices.cpp" line="462"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/subsurfacewebservices.cpp" line="462"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/subsurfacewebservices.cpp" line="462"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="467"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Felformaterat XML svar. Rad %1: %2</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="120"/>
-        <location filename="../tmp/Subsurface-4.8.4/qt-models/divetripmodel.cpp" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.5/qt-models/divetripmodel.cpp" line="124"/>
-        <location filename="../tmp/Subsurface-4.8.6/qt-models/divetripmodel.cpp" line="124"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="122"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="742"/>
+        <location filename="../core/save-xml.c" line="749"/>
         <source>Failed to save dives to %s (%s)</source>
         <translation>Misslyckades spara dyk till %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="863"/>
+        <location filename="../core/save-xml.c" line="871"/>
         <source>Failed to save divesites to %s (%s)</source>
         <translation>Misslyckades spara dykplatser till %s (%s)</translation>
     </message>
@@ -20405,169 +12443,106 @@ Is the Uemis Zurich plugged in correctly?</source>
     <name>main</name>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="15"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="15"/>
         <source>Subsurface-mobile</source>
         <translation>Subsurface-mobile</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="206"/>
         <source>Dive list</source>
         <translation>Dyklista</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="233"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="233"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="233"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="233"/>
         <source>Dive management</source>
         <translation>Dykhantering</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="295"/>
         <source>Disable auto cloud sync</source>
         <translation>Stäng av molnsynkronisering</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="295"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="295"/>
         <source>Enable auto cloud sync</source>
         <translation>Automatisk molnsynkronisering</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="343"/>
         <source>Disable location service</source>
         <translation>Stäng av platstjänsten</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="365"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="365"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="238"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="238"/>
         <source>Add dive manually</source>
         <translation>Lägg till dyk</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="252"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="252"/>
         <source>Download from DC</source>
         <translation>Ladda ner från dykdator</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="273"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="273"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="273"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="273"/>
         <source>Manual sync with cloud</source>
         <translation>Manuell molnsynkronisering</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="301"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>Att stänga av automatisk molnsynkronisering medför att data sparas lokalt. Det är användbart i situationer med begränsad eller ingen nätverksåtkomst. Välj &apos;Manuell molnsynkronisering&apos; om du har en internetuppkoppling och vill synkronisera din data till molntjänsten.</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="312"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="312"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="400"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="400"/>
         <source>Help</source>
         <translation>Hjälp</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="264"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="264"/>
         <source>Apply GPS fixes</source>
         <translation>Sätt GPS-position</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="319"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="319"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="319"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="319"/>
         <source>Show GPS fixes</source>
         <translation>Visa GPS-position</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="332"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="332"/>
         <source>Clear GPS cache</source>
         <translation>Rensa GPS-cache</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="378"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="378"/>
         <source>Developer</source>
         <translation>Utvecklare</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="381"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="381"/>
         <source>App log</source>
         <translation>Appikationslogg</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="389"/>
         <source>Theme information</source>
         <translation>Temainformation</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="354"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="354"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.4/mobile-widgets/qml/main.qml" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.5/mobile-widgets/qml/main.qml" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.6/mobile-widgets/qml/main.qml" line="343"/>
         <source>Run location service</source>
         <translation>Aktivera platstjänsten</translation>
     </message>
@@ -20583,36 +12558,24 @@ Is the Uemis Zurich plugged in correctly?</source>
     <name>plannerDetails</name>
     <message>
         <location filename="../desktop-widgets/plannerDetails.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerDetails.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerDetails.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerDetails.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerDetails.h" line="92"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerDetails.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerDetails.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerDetails.ui" line="43"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerDetails.ui" line="43"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerDetails.h" line="93"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dykplansdetaljer&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerDetails.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerDetails.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerDetails.ui" line="59"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerDetails.ui" line="59"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerDetails.h" line="94"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerDetails.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerDetails.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerDetails.ui" line="92"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerDetails.ui" line="92"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerDetails.h" line="95"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -20630,36 +12593,24 @@ p, li { white-space: pre-wrap; }
     <name>plannerSettingsWidget</name>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="14"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="14"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="560"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="74"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="74"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="561"/>
         <source>Rates</source>
         <translation>Hastigheter</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="95"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="95"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="562"/>
         <source>Ascent</source>
         <translation>Uppstigning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="104"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="104"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="563"/>
         <source>below 75% avg. depth</source>
         <translation>under 75% av snittdjup</translation>
@@ -20670,21 +12621,6 @@ p, li { white-space: pre-wrap; }
         <location filename="../desktop-widgets/plannerSettings.ui" line="145"/>
         <location filename="../desktop-widgets/plannerSettings.ui" line="162"/>
         <location filename="../desktop-widgets/plannerSettings.ui" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="206"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="111"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="128"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="145"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="162"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="206"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="564"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="566"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="568"/>
@@ -20695,90 +12631,60 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="121"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="121"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="565"/>
         <source>75% to 50% avg. depth</source>
         <translation>75% till 50% av snittdjup</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="138"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="138"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="567"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% av snittdjup till 6m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="155"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="155"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="569"/>
         <source>6m to surface</source>
         <translation>Från 6m till ytan</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="175"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="571"/>
         <source>Descent</source>
         <translation>Nedstigning</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="187"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="187"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="572"/>
         <source>surface to the bottom</source>
-        <translation>från ytan till botten</translation>
+        <translation>Från ytan till botten</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="240"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="240"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="574"/>
         <source>Planning</source>
         <translation>Planering</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="372"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="343"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="343"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="585"/>
         <source>Min. switch duration O₂% below 100%</source>
         <translation>Min. bytestid för O₂% under 100%</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="439"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="419"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="419"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="419"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="595"/>
         <source>VPM-B deco</source>
         <translation>VPM-B</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="502"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="426"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="426"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="426"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="436"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="436"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="597"/>
         <source>Reserve gas</source>
         <translation>Gasreserv</translation>
@@ -20787,15 +12693,6 @@ p, li { white-space: pre-wrap; }
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="621"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="621"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="261"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="592"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="621"/>
         <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"/>
@@ -20805,12 +12702,6 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../desktop-widgets/plannerSettings.ui" line="386"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="406"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="323"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="406"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="583"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="594"/>
         <source>%</source>
@@ -20818,27 +12709,18 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="293"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="293"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="293"/>
-        <location filename="../tmp/Subsurface-4.8.6/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>
         <translation>Senarelägg gasbyte om ett stopp ej krävs</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="296"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="296"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="580"/>
         <source>Only switch at required stops</source>
         <translation>Byt endast vid nödvändiga stopp</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="352"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="363"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="363"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="586"/>
         <source>Plan backgas breaks</source>
         <translation>Planera pauser med bakgas</translation>
@@ -20847,12 +12729,6 @@ p, li { white-space: pre-wrap; }
         <location filename="../desktop-widgets/plannerSettings.ui" line="333"/>
         <location filename="../desktop-widgets/plannerSettings.ui" line="536"/>
         <location filename="../desktop-widgets/plannerSettings.ui" line="821"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="800"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="800"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="370"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="800"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="587"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="643"/>
         <source>min</source>
@@ -20860,72 +12736,48 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="389"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="389"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="589"/>
         <source>Last stop at 6m</source>
         <translation>Sista stopp vid 6m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="419"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="396"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="396"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="591"/>
         <source>Maximize bottom time allowed by gas and no decompression limits</source>
         <translation>Maximal bottentid som tillåts av gas och direktuppstignings gränser</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="422"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="399"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="593"/>
         <source>Recreational mode</source>
         <translation>Sportdykarläge</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="379"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="336"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="336"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="584"/>
         <source>Drop to first depth</source>
         <translation>Ner till första djup</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="449"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="449"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="449"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="449"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="598"/>
         <source>Safety stop</source>
         <translation>Säkerhetsstopp</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="485"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="485"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="599"/>
         <source>Conservatism level</source>
         <translation>Nivå av konservatism</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="310"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="600"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="515"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="515"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="602"/>
         <source>Dive mode</source>
         <translation>Dykläge</translation>
@@ -20942,9 +12794,6 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="525"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="525"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="603"/>
         <source>Gas options</source>
         <translation>Gasval</translation>
@@ -20952,12 +12801,6 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="567"/>
         <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="608"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="608"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="546"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="608"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="604"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="607"/>
         <source>ℓ/min</source>
@@ -20965,207 +12808,138 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="661"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="640"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="640"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="640"/>
         <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="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="741"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="741"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="741"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="631"/>
         <source>Compute variations of plan (performance cost)</source>
         <translation>Beräkna variationer av planen (resurskrävande)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="765"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="744"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="744"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="744"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="633"/>
         <source>Display plan variations</source>
         <translation>Visa variationer av planen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="782"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="761"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="761"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="761"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="635"/>
         <source>SAC factor</source>
         <translation>SAC-faktor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="789"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="768"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="768"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="768"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="637"/>
         <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source>
         <translation>Används för att beräkna minsta möjliga gas. Överväg två dykare med en ökad SAC efter att en av dykarna har fått slut på gas (OoG).</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="811"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="790"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="790"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="639"/>
         <source>Problem solving time</source>
         <translation>Problemlösningstid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="818"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="797"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="797"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="797"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="641"/>
         <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source>
         <translation>Används för att beräkna minsta möjliga gas. Ytterligare tid vid maxdjup efter att en av dykarna har fått slut på gas (OoG).</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="637"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="637"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="637"/>
         <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>Används för att beräkna bästa mix. Välj bästa mix djup i tabellen &apos;Tillgängliga gaser&apos; genom att ange gas djup, följt av &quot;B&quot; (bästa trimix mix) eller &quot;BN&quot; (bästa nitrox mix)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="313"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="313"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="313"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="582"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="409"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="303"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="303"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="581"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="677"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="656"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="656"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="613"/>
         <source>Bottom SAC</source>
         <translation>SAC under bottenfas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="684"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="663"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="663"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="663"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="614"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ under bottenfas</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="691"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="670"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="670"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="670"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="615"/>
         <source>Best mix END</source>
         <translation>Bästa mix END</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="677"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="677"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="677"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="616"/>
         <source>Notes</source>
         <translation>Anteckningar</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="736"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="715"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="715"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="715"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="623"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>I dykplanen, visa körtid (absolut tid) av stopp</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="739"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="718"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="718"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="718"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="625"/>
         <source>Display runtime</source>
         <translation>Visa körtid</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="749"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="728"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="728"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="728"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="627"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>I dykplanen, visa stopptid (relativ tid) av stopp</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="752"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="731"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="731"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="629"/>
         <source>Display segment duration</source>
         <translation>Visa varaktighet för segment</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="726"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="705"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="705"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="705"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="619"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>I dykplanen, visa förflyttningar eller hantera dem som implicita</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="729"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="708"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="708"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="708"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="621"/>
         <source>Display transitions in deco</source>
         <translation>Visa byten av djup under deko</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="719"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="698"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="698"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="698"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="617"/>
         <source>Verbatim dive plan</source>
         <translation>Verbatim dykplan</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="775"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="754"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="754"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="754"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="634"/>
         <source>Deco pO₂</source>
         <translation>pO₂ under deko</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="580"/>
-        <location filename="../tmp/Subsurface-4.8.4/desktop-widgets/plannerSettings.ui" line="559"/>
-        <location filename="../tmp/Subsurface-4.8.5/desktop-widgets/plannerSettings.ui" line="559"/>
-        <location filename="../tmp/Subsurface-4.8.6/desktop-widgets/plannerSettings.ui" line="559"/>
         <location filename="../subsurface/desktop-widgets/ui_plannerSettings.h" line="605"/>
         <source>Deco SAC</source>
         <translation>SAC under deko</translation>
diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts
index 0f624cfa6..62e31057e 100644
--- a/translations/subsurface_vi.ts
+++ b/translations/subsurface_vi.ts
@@ -401,7 +401,7 @@
 <context>
     <name>CloudStorageAuthenticate</name>
     <message>
-        <location filename="../core/cloudstorage.cpp" line="65"/>
+        <location filename="../core/cloudstorage.cpp" line="66"/>
         <source>Cloud account verification required, enter PIN in preferences</source>
         <translation type="unfinished"/>
     </message>
@@ -607,7 +607,7 @@
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="78"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="92"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation type="unfinished"><numerusform></numerusform></translation>
@@ -680,7 +680,7 @@
 <context>
     <name>Command::EditAirTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="227"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="241"/>
         <source>air temperature</source>
         <translation type="unfinished"/>
     </message>
@@ -688,7 +688,7 @@
 <context>
     <name>Command::EditAtmPress</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="272"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="286"/>
         <source>Atm. pressure</source>
         <translation type="unfinished"/>
     </message>
@@ -696,7 +696,7 @@
 <context>
     <name>Command::EditDepth</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="320"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="334"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
@@ -704,7 +704,7 @@
 <context>
     <name>Command::EditDiveSite</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="342"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="356"/>
         <source>dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -760,7 +760,7 @@
 <context>
     <name>Command::EditDuration</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="296"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="310"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
@@ -768,7 +768,7 @@
 <context>
     <name>Command::EditNotes</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="142"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="156"/>
         <source>notes</source>
         <translation type="unfinished"/>
     </message>
@@ -776,7 +776,7 @@
 <context>
     <name>Command::EditRating</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="185"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="199"/>
         <source>rating</source>
         <translation type="unfinished"/>
     </message>
@@ -784,7 +784,7 @@
 <context>
     <name>Command::EditSuit</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="164"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="178"/>
         <source>suit</source>
         <translation type="unfinished"/>
     </message>
@@ -816,7 +816,7 @@
 <context>
     <name>Command::EditVisibility</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="206"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="220"/>
         <source>visibility</source>
         <translation type="unfinished"/>
     </message>
@@ -824,7 +824,7 @@
 <context>
     <name>Command::EditWaterTemp</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="251"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="265"/>
         <source>water temperature</source>
         <translation type="unfinished"/>
     </message>
@@ -928,42 +928,42 @@
 <context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="181"/>
+        <location filename="../core/configuredivecomputer.cpp" line="183"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="197"/>
+        <location filename="../core/configuredivecomputer.cpp" line="199"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="545"/>
+        <location filename="../core/configuredivecomputer.cpp" line="547"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="554"/>
+        <location filename="../core/configuredivecomputer.cpp" line="556"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="563"/>
+        <location filename="../core/configuredivecomputer.cpp" line="565"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="572"/>
+        <location filename="../core/configuredivecomputer.cpp" line="574"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="588"/>
+        <location filename="../core/configuredivecomputer.cpp" line="590"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Không thể tạo nội dung cho thiết bị đo lặn</translation>
     </message>
     <message>
-        <location filename="../core/configuredivecomputer.cpp" line="607"/>
+        <location filename="../core/configuredivecomputer.cpp" line="609"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2530,93 +2530,93 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Type</source>
         <translation>Loại</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Size</source>
         <translation>Kích thước</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>Work press.</source>
         <translation>Ấn làm việc.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
-        <location filename="../qt-models/cylindermodel.cpp" line="26"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="27"/>
         <source>Start press.</source>
         <translation>Ấn bắt đầu.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>End press.</source>
         <translation>Ấn kết thúc.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>O₂%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
         <source>He%</source>
         <translation>Anh ấy%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Deco switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Bot. MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>MND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="18"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="19"/>
         <source>Use</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="53"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="54"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="57"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="58"/>
         <source>ℓ</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="237"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="238"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Click vào đây sẽ loại bỏ này xi lanh.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="248"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="249"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="250"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="251"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max. depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="252"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max. depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="235"/>
+        <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>Khí này hiện đang được sử dụng. Chỉ các xi lanh không được sử dụng khi lặn có thể được gỡ bỏ.</translation>
     </message>
@@ -2624,54 +2624,54 @@
 <context>
     <name>DiveComponentSelection</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="487"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="488"/>
         <source>Dive site: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="489"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="490"/>
         <source>Dive master: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="491"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="492"/>
         <source>Buddy: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="493"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="494"/>
         <source>Rating: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="495"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="496"/>
         <source>Visibility: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="497"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="498"/>
         <source>Notes:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="499"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="500"/>
         <source>Suit: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="501"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="502"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="511"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="512"/>
         <source>Cylinders:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="519"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/>
         <source>Weights:
 </source>
         <translation type="unfinished"/>
@@ -3045,38 +3045,38 @@ GPS location:</source>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="186"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="187"/>
         <source> (cyl. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="190"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
         <source>ICD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="191"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
         <source>ΔHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="192"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="193"/>
         <source>ΔN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="213"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="214"/>
         <source>Manual switch to OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="215"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>bắt đầu</translation>
     </message>
     <message>
-        <location filename="../profile-widget/diveeventitem.cpp" line="216"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="217"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>kết thúc</translation>
@@ -3085,27 +3085,27 @@ GPS location:</source>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="37"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="38"/>
         <source>Date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="39"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="40"/>
         <source>Duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="41"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="42"/>
         <source>Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveimportedmodel.cpp" line="71"/>
+        <location filename="../qt-models/diveimportedmodel.cpp" line="72"/>
         <source>min</source>
         <translation type="unfinished"/>
     </message>
@@ -3170,117 +3170,117 @@ GPS location:</source>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="911"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="912"/>
         <source>Expand all</source>
         <translation>Mở rộng tất cả</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="913"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="914"/>
         <source>Collapse all</source>
         <translation>Mở ra tất cả</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="918"/>
         <source>Collapse others</source>
         <translation>Mở ra tất cả</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="921"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
         <source>Remove dive(s) from trip</source>
         <translation>Loại bỏ (các)máy lặn từ chuyến đi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="922"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="923"/>
         <source>Create new trip above</source>
         <translation>Tạo một chuyến đi mới phía trước</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="937"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="938"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Thêm (các)chuyến đi lặn ngay lập tức ở trên</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="939"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="940"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Thêm (các)chuyến đi lặn ngay lập tức ở dưới</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="943"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
         <source>Merge trip with trip above</source>
         <translation>Gập chuyến đi với chuyến đi trước</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="944"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="945"/>
         <source>Merge trip with trip below</source>
         <translation>Gộp chuyến đi với chuyến đi bên dưới</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="948"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="949"/>
         <source>Delete dive(s)</source>
         <translation>Xóa (các)lần lặn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="950"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="951"/>
         <source>Mark dive(s) invalid</source>
         <translation>Đánh dấu (các)lần lặn không hợp lệ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="954"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="955"/>
         <source>Merge selected dives</source>
         <translation>Hợp nhất các lần lặn được chọn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="956"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
         <source>Renumber dive(s)</source>
         <translation>Đánh dấu lại (các)lần lặn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="957"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
         <source>Shift dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="958"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
         <source>Split selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="959"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
         <source>Load media from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="960"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="961"/>
         <source>Load media from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="986"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="987"/>
         <source>Open media files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="989"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
         <source>Media files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="990"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
         <source>Image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="991"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
         <source>Video files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="992"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="993"/>
         <source>All files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="1041"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="1042"/>
         <source>%1 does not appear to be an image</source>
         <translation type="unfinished"/>
     </message>
@@ -3546,7 +3546,7 @@ GPS location:</source>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="559"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="113"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="115"/>
         <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="412"/>
         <source>Light</source>
         <translation>Sáng</translation>
@@ -3558,157 +3558,157 @@ GPS location:</source>
         <translation>Cát</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
         <source>Send the dive data to dive-share.appspot.com website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="94"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="96"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
         <source>Subsurface dive sites native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="98"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="100"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
         <source>Write dive as TeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="102"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
         <source>Write dive as LaTeX macros to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="104"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
         <source>Write the profile image as PNG file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="106"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="108"/>
         <source>Write profile data to a CSV file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/>
         <source>UDDF files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/>
         <source>CSV files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="201"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="203"/>
         <source>HTML files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="165"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="174"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Subsurface files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="175"/>
         <source>Export Subsurface dive sites XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>TeX files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="150"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="164"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Export Subsurface XML</source>
         <translation>Xuất dữ liệu dưới dạng Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="182"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="188"/>
         <source>Export to TeX file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Save profile image</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="196"/>
         <source>Save profile data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="200"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="202"/>
         <source>Export HTML files as</source>
         <translation>Xuất dữ liệu từ tập tin HTML dưới dạng</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="214"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="216"/>
         <source>Please wait, exporting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="249"/>
-        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="482"/>
+        <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 type="unfinished"/>
     </message>
@@ -4091,62 +4091,62 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="171"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="173"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="272"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="274"/>
         <source>cyl.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="378"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="380"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="382"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="384"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="386"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="388"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="390"/>
         <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1026"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1028"/>
         <source>min</source>
         <translation>nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1032"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1034"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1035"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1037"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="1082"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="1084"/>
         <source>Stop times</source>
         <translation type="unfinished"/>
     </message>
@@ -4356,12 +4356,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveSiteSortedModel</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="271"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="278"/>
         <source>Delete dive site?</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../qt-models/divelocationmodel.cpp" line="272"/>
+        <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 type="unfinished"><numerusform></numerusform></translation>
@@ -4370,186 +4370,186 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModelBase</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="66"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="274"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="314"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="208"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="275"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="315"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="276"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="316"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="277"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="317"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="211"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="278"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="318"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="279"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="319"/>
         <source>Rating</source>
         <translation>Xếp hạng</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="320"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="214"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="321"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="282"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="322"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="283"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="323"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="217"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="324"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="325"/>
         <source>Temp.(°%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="326"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="220"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="327"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="288"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="328"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="222"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="289"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="329"/>
         <source>Suit</source>
         <translation>Đồ lặn</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="223"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="290"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="330"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="291"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="331"/>
         <source>Cylinder</source>
         <translation>Xilan</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="225"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="292"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="332"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="293"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="333"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="336"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="337"/>
         <source>/min</source>
         <translation>/nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="231"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="296"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="338"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="297"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="339"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="234"/>
         <source>Max. CNS</source>
         <translation>CNS tối đa</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="300"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="342"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="236"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="301"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="343"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="237"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="344"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="238"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="345"/>
         <source>Media before/during/after dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="239"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="304"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="240"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="305"/>
         <source>Country</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="241"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="306"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="346"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="242"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="307"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="347"/>
         <source>Buddy</source>
         <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="243"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="308"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="348"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="244"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="309"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="349"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="280"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="281"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="284"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="285"/>
         <source>Temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="286"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="287"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="294"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="295"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="298"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="340"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="299"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="341"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="302"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="303"/>
         <source>Media</source>
         <translation type="unfinished"/>
     </message>
@@ -4557,106 +4557,106 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="241"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="243"/>
         <source>internal error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="277"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="279"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="526"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="717"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="528"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="719"/>
         <source>Done</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="562"/>
         <source>Uploading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="592"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="594"/>
         <source>Downloading dive list...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="635"/>
         <source>Downloading %1 dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="667"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="669"/>
         <source>Download finished - %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="681"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="683"/>
         <source>Problem with download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="693"/>
         <source>Corrupted download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="682"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="692"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="694"/>
         <source>The archive could not be opened:
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="160"/>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="491"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="162"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="493"/>
         <source>No dives were selected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="170"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="172"/>
         <source>Stylesheet to export to divelogs.de is not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="180"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="182"/>
         <source>Failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="718"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="720"/>
         <source>Upload finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="731"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="733"/>
         <source>Upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="734"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="736"/>
         <source>Upload successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="737"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="739"/>
         <source>Login failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="740"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="742"/>
         <source>Cannot parse response</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="751"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="753"/>
         <source>Error: %1</source>
         <translation type="unfinished"/>
     </message>
@@ -4721,73 +4721,73 @@ Existing Site</source>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="86"/>
         <source>Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="90"/>
         <source>Choose Bluetooth download mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="177"/>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="180"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="202"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="205"/>
         <source>Connecting to dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/>
         <source>Error</source>
         <translation>Lỗi</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="324"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="349"/>
         <source>Find Garmin dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="351"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/>
         <source>Cancel download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="430"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="455"/>
         <source>Choose file for dive computer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="431"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
         <source>Log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="456"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="481"/>
         <source>Choose file for dive computer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="457"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="482"/>
         <source>Dump files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="485"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="510"/>
         <source>Retry download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="444"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="469"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="445"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="470"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
@@ -4874,10 +4874,10 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="211"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="188"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="262"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="303"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="392"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="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="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="334"/>
         <source>Download</source>
         <translation type="unfinished"/>
@@ -4908,7 +4908,7 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="330"/>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <location filename="../subsurface/desktop-widgets/ui_downloadfromdivecomputer.h" line="340"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
@@ -4924,72 +4924,72 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="59"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/>
         <source> Vendor name: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="93"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="97"/>
         <source>USB device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="105"/>
         <source> Dive Computer:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="141"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="145"/>
         <source> Connection:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/>
         <source> Previously used dive computers: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="266"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="270"/>
         <source>Retry</source>
         <translation>Thử lại</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="298"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="302"/>
         <source>Quit</source>
         <translation>Thoát</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="312"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="316"/>
         <source>Rescan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="321"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="325"/>
         <source> Downloaded dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="322"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="326"/>
         <source>Info:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="345"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="349"/>
         <source>force downloading all dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="383"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="387"/>
         <source>Accept</source>
         <translation>Chấp nhậ</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="403"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="407"/>
         <source>Select All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="412"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="416"/>
         <source>Unselect All</source>
         <translation type="unfinished"/>
     </message>
@@ -4997,7 +4997,7 @@ Existing Site</source>
 <context>
     <name>DownloadThread</name>
     <message>
-        <location filename="../core/downloadfromdcthread.cpp" line="101"/>
+        <location filename="../core/downloadfromdcthread.cpp" line="102"/>
         <source>No new dives downloaded from dive computer</source>
         <translation type="unfinished"/>
     </message>
@@ -5005,7 +5005,7 @@ Existing Site</source>
 <context>
     <name>EditBuddies</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="602"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="638"/>
         <source>buddies</source>
         <translation type="unfinished"/>
     </message>
@@ -5013,7 +5013,7 @@ Existing Site</source>
 <context>
     <name>EditDiveMaster</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="625"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="661"/>
         <source>dive master</source>
         <translation type="unfinished"/>
     </message>
@@ -5021,15 +5021,23 @@ Existing Site</source>
 <context>
     <name>EditMode</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="440"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="454"/>
         <source>dive mode</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>EditNumber</name>
+    <message>
+        <location filename="../desktop-widgets/command_edit.cpp" line="475"/>
+        <source>number</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditTags</name>
     <message>
-        <location filename="../desktop-widgets/command_edit.cpp" line="570"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="606"/>
         <source>tags</source>
         <translation type="unfinished"/>
     </message>
@@ -5037,7 +5045,7 @@ Existing Site</source>
 <context>
     <name>EditTagsBase</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="511"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="547"/>
         <source>Edit %1 (%n dive(s))</source>
         <extracomment>remove the part in parentheses for %n = 1</extracomment>
         <translation type="unfinished"><numerusform></numerusform></translation>
@@ -5092,129 +5100,134 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="47"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="41"/>
         <source>Reset / close</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="57"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="102"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="123"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="140"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="64"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="58"/>
         <source>People</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="71"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="95"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="147"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="189"/>
+        <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"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="78"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="72"/>
         <source>Rating</source>
         <translation>Xếp hạng</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="85"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="79"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="109"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="103"/>
         <source>From</source>
         <translation>Từ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="116"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="110"/>
         <source>To</source>
         <translation>Đến</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="133"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="127"/>
         <source>Visibility</source>
         <translation>Tầm nhìn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="163"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="157"/>
         <source>Equipment</source>
         <translation>Dụng cụ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="179"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="173"/>
         <source>Water Temp</source>
         <translation>Nhiệt độ trung bình của nước</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="196"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="190"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="203"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="197"/>
         <source>Suit</source>
         <translation>Đồ lặn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="210"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="204"/>
         <source>Notes</source>
         <translation>Ghi chú</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="217"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="211"/>
         <source>Air Temp</source>
         <translation>Nhiệt độ không khí</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="276"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="270"/>
         <source>Logged</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="286"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="280"/>
         <source>Planned</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="330"/>
+        <location filename="../desktop-widgets/filterwidget2.ui" line="310"/>
+        <source>Close filters</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="345"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="364"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="383"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="402"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="421"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="440"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="350"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="369"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="388"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="407"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="426"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="445"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="355"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="374"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="393"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="412"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="431"/>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="450"/>
+        <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 type="unfinished"/>
     </message>
@@ -5224,7 +5237,6 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/filterwidget2.ui" line="316"/>
         <location filename="../subsurface/desktop-widgets/ui_filterwidget.h" line="124"/>
         <source>Close and reset filters</source>
         <translation type="unfinished"/>
@@ -5307,12 +5319,12 @@ Existing Site</source>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2225"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2227"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2230"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2232"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -5328,7 +5340,7 @@ Existing Site</source>
 <context>
     <name>GasSelectionModel</name>
     <message>
-        <location filename="../qt-models/models.cpp" line="38"/>
+        <location filename="../qt-models/models.cpp" line="39"/>
         <source>cyl.</source>
         <translation type="unfinished"/>
     </message>
@@ -5372,7 +5384,7 @@ Existing Site</source>
 <context>
     <name>GpsLocation</name>
     <message>
-        <location filename="../core/gpslocation.cpp" line="132"/>
+        <location filename="../core/gpslocation.cpp" line="134"/>
         <source>Unknown GPS location (no GPS source)</source>
         <translation type="unfinished"/>
     </message>
@@ -5586,9 +5598,9 @@ Existing Site</source>
     <name>MainTab</name>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="30"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="504"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="450"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="511"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="512"/>
         <source>Notes</source>
@@ -5614,21 +5626,21 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="110"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="228"/>
+        <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 type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="120"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="229"/>
+        <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 type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="195"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="545"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="546"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="498"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
@@ -5671,25 +5683,24 @@ Existing Site</source>
         <translation>Tầm nhìn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="343"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="508"/>
         <source>Suit</source>
         <translation>Đồ lặn</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="402"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="398"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="509"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="412"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="62"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/>
         <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="513"/>
         <source>Equipment</source>
         <translation>Dụng cụ</translation>
@@ -5707,93 +5718,93 @@ Existing Site</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="70"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/>
         <source>Extra Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="64"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="63"/>
         <source>Information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="66"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="65"/>
         <source>Statistics</source>
         <translation>Thống kê</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="68"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="67"/>
         <source>Media</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="71"/>
         <source>Dive sites</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="91"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="90"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="95"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="94"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="99"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/>
         <source>OK</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/>
         <source>Undo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="731"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="735"/>
         <source>Warning: edited %1 dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="225"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="221"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="226"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="222"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="264"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="260"/>
         <source>Multiple dives are being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="266"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="262"/>
         <source>This dive is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="454"/>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="494"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="458"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="489"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="491"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="686"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="690"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="687"/>
+        <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="691"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -5861,7 +5872,7 @@ Existing Site</source>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="494"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
         <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="535"/>
         <source>Open</source>
         <translation type="unfinished"/>
@@ -6280,45 +6291,45 @@ Existing Site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="485"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="532"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1514"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="491"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="492"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="495"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="496"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="691"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="655"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
+        <location filename="../desktop-widgets/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"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/divelistview.cpp" line="692"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="693"/>
         <source>Trying to merge dives with %1min interval in between</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="256"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
         <source>Template backup created</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="257"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="258"/>
         <source>The following backup printing templates were created:
 
 %1
@@ -6332,229 +6343,229 @@ can overwrite them on startup.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="606"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="607"/>
         <source>Please save or cancel the current dive edit before going online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="620"/>
         <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="629"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="630"/>
         <source>Failure taking cloud storage online</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="702"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="703"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="805"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="806"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="857"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="858"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="913"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="914"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1669"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1772"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
         <source>multiple files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1750"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1766"/>
         <source>Open dive site file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1785"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1016"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1017"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1284"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/>
         <source>Dive log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1263"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1543"/>
-        <source>Subsurface files</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1306"/>
-        <source>Cochran</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1559"/>
+        <source>Subsurface files</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1265"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
-        <source>DiveLogs.de</source>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+        <source>Cochran</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1266"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/>
-        <source>JDiveLog</source>
+        <source>DiveLogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/>
-        <source>Liquivision</source>
+        <source>JDiveLog</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/>
-        <source>Suunto</source>
+        <source>Liquivision</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/>
-        <source>UDCF</source>
+        <source>Suunto</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/>
-        <source>UDDF</source>
-        <translation>UDDF</translation>
+        <source>UDCF</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1271"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/>
-        <source>XML</source>
-        <translation type="unfinished"/>
+        <source>UDDF</source>
+        <translation>UDDF</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/>
-        <source>Divesoft</source>
+        <source>XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/>
-        <source>Datatrak/WLog</source>
+        <source>Divesoft</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1274"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/>
-        <source>MkVI files</source>
+        <source>Datatrak/WLog</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/>
-        <source>APD log viewer</source>
+        <source>MkVI files</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1276"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/>
-        <source>OSTCtools</source>
+        <source>APD log viewer</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1277"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/>
+        <source>OSTCtools</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
         <source>DAN DL7</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/>
         <source>CSV</source>
         <translation>CSV</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1333"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1334"/>
         <source>All files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/>
         <source>Dive site files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1343"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1344"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1345"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="618"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1349"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="619"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1542"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1558"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1630"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1646"/>
         <source>[local cache for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1631"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1647"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1698"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1699"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1723"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1739"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1911"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1927"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
@@ -6674,7 +6685,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
 <context>
     <name>PasteDives</name>
     <message numerus="yes">
-        <location filename="../desktop-widgets/command_edit.cpp" line="728"/>
+        <location filename="../desktop-widgets/command_edit.cpp" line="760"/>
         <source>Paste onto %n dive(s)</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
@@ -6907,22 +6918,32 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="12"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="14"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="25"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="27"/>
         <source>Subsurface files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="51"/>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
+        <source>Warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="64"/>
+        <source>Couldn&apos;t execute ffmpeg at given location. Thumbnailing will not work.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="70"/>
         <source>Select ffmpeg executable</source>
         <translation type="unfinished"/>
     </message>
@@ -7170,7 +7191,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="11"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="12"/>
         <source>Profile</source>
         <translation>Hồ sơ</translation>
     </message>
@@ -7806,17 +7827,17 @@ Please export this template to a different file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="840"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="837"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1451"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1435"/>
         <source>Make first dive computer</source>
         <translation type="unfinished"/>
     </message>
@@ -7831,103 +7852,103 @@ Please export this template to a different file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1440"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
         <source>Delete this dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1441"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
         <source>Split this dive computer into own dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1457"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1454"/>
         <source> (cyl. %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1463"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1460"/>
         <source>Add setpoint change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1465"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1462"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1467"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1464"/>
         <source>Split dive into two</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1477"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
         <source>Change divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1501"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1498"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1505"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1502"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1507"/>
         <source>Hide similar events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1517"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1548"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1555"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1545"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1552"/>
         <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1570"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1567"/>
         <source>Unhide all events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1598"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1595"/>
         <source>Hide all %1 events?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1630"/>
         <source>Remove the selected event?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1631"/>
         <source>%1 @ %2:%3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1786"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1783"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1787"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1784"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1792"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1789"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -7935,146 +7956,151 @@ Please export this template to a different file.</source>
 <context>
     <name>QMLManager</name>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="206"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="207"/>
         <source>Starting...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="275"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/>
         <source>Open local dive data file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="283"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
         <source>Opening local data file failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/>
         <source>%1 dives loaded from local dive data file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="425"/>
         <source>Error parsing local storage, giving up</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="427"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="434"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="428"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="504"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="473"/>
         <source>Invalid format for email address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="544"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="552"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="559"/>
         <source>No response from cloud server to validate the credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="567"/>
         <source>Incorrect cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="566"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="593"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="600"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="607"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="621"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="628"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="634"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="641"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="646"/>
         <source>Cloud credentials valid, loading dives...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="649"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="656"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="695"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="702"/>
         <source>Loading dives from local storage (&apos;no cloud&apos; mode)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="748"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="766"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="941"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="942"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="952"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="953"/>
         <source>min</source>
         <translation>nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="940"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="951"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1479"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1048"/>
+        <source>weight</source>
+        <translation>cân nặng</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1493"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -8090,15 +8116,15 @@ Please export this template to a different file.</source>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2127"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2151"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2153"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2129"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2137"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2148"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2131"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2139"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2150"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -8119,23 +8145,23 @@ Please export this template to a different file.</source>
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="61"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="138"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="139"/>
         <location filename="../subsurface/desktop-widgets/ui_renumber.h" line="90"/>
         <source>New starting number</source>
         <translation>Số bắt đầu mới</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="136"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="137"/>
         <source>New number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="141"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
         <source>Renumber selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="143"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="144"/>
         <source>Renumber all dives</source>
         <translation type="unfinished"/>
     </message>
@@ -8143,7 +8169,7 @@ Please export this template to a different file.</source>
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2248"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2250"/>
         <source>Reset settings failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -8452,38 +8478,38 @@ Not all media files have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="284"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="285"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="286"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="287"/>
         <source>Image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="367"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="368"/>
         <source>Selected dive date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="369"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
         <source>First selected dive date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="370"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="371"/>
         <source>Last selected dive date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="372"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/>
         <source>
 Files with inappropriate date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="382"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="383"/>
         <source>No Exif date/time found</source>
         <translation type="unfinished"/>
     </message>
@@ -8585,28 +8611,28 @@ Files with inappropriate date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="54"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
         <source>Open SmartTrak files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
         <source>SmartTrak files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="55"/>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="56"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>All files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="67"/>
         <source>Subsurface files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="65"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="66"/>
         <source>Open Subsurface files</source>
         <translation type="unfinished"/>
     </message>
@@ -8670,25 +8696,45 @@ Files with inappropriate date/time</source>
         <translation>Dụng cụ</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="48"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.ui" line="74"/>
+        <source>Suit</source>
+        <translation>Đồ lặn</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
         <source>Cylinders</source>
         <translation>Xilanh</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="49"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="52"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="56"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="53"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="57"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="60"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="64"/>
+        <source>Undo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveEquipment.cpp" line="306"/>
+        <source>Warning: edited %1 dives</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>TabDiveExtraInfo</name>
@@ -8796,29 +8842,29 @@ Files with inappropriate date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="75"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="76"/>
         <source>/min</source>
         <translation>/nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>min</source>
         <translation>nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="81"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="82"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="103"/>
+        <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="104"/>
         <source>d</source>
         <translation type="unfinished"/>
     </message>
@@ -9307,7 +9353,7 @@ mixed from Air and using:
 <context>
     <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/>
         <source>%1click to visit %2</source>
         <translation type="unfinished"/>
     </message>
@@ -9609,12 +9655,12 @@ Language: %1</source>
     <name>VideoFrameExtractor</name>
     <message>
         <location filename="../core/videoframeextractor.cpp" line="93"/>
-        <source>ffmpeg failed to start - video thumbnail creation suspended</source>
+        <source>ffmpeg failed to start - video thumbnail creation suspended. To enable video thumbnailing, set working executable in preferences.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/videoframeextractor.cpp" line="99"/>
-        <source>failed waiting for ffmpeg - video thumbnail creation suspended</source>
+        <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"/>
     </message>
 </context>
@@ -9682,12 +9728,12 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="329"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="331"/>
         <source>Operation timed out</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="350"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="352"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -9705,7 +9751,7 @@ Language: %1</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-models/weightmodel.cpp" line="72"/>
+        <location filename="../qt-models/weightmodel.cpp" line="71"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
@@ -9713,15 +9759,15 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2175"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2198"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2200"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2177"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2187"/>
-        <location filename="../core/configuredivecomputerthreads.cpp" line="2195"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2179"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2189"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="2197"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
@@ -9831,7 +9877,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="801"/>
+        <location filename="../core/libdivecomputer.c" line="802"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -9842,7 +9888,7 @@ Maximum</source>
         <location filename="../core/cochran.c" line="306"/>
         <location filename="../core/cochran.c" line="312"/>
         <location filename="../core/cochran.c" line="382"/>
-        <location filename="../core/libdivecomputer.c" line="244"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deco stop</source>
         <translation>dừng lại deco</translation>
     </message>
@@ -9850,7 +9896,7 @@ Maximum</source>
         <location filename="../core/cochran.c" line="333"/>
         <location filename="../core/cochran.c" line="387"/>
         <location filename="../core/import-csv.c" line="680"/>
-        <location filename="../core/libdivecomputer.c" line="246"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>ascent</source>
         <translation>đường dốc</translation>
     </message>
@@ -9862,20 +9908,20 @@ Maximum</source>
     </message>
     <message>
         <location filename="../core/cochran.c" line="345"/>
-        <location filename="../core/libdivecomputer.c" line="262"/>
+        <location filename="../core/libdivecomputer.c" line="263"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="350"/>
-        <location filename="../core/libdivecomputer.c" line="261"/>
+        <location filename="../core/libdivecomputer.c" line="262"/>
         <source>maxdepth</source>
         <translation>độ sâu tối đa</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="355"/>
         <location filename="../core/cochran.c" line="401"/>
-        <location filename="../core/libdivecomputer.c" line="263"/>
+        <location filename="../core/libdivecomputer.c" line="264"/>
         <source>pO₂</source>
         <translation type="unfinished"/>
     </message>
@@ -9884,8 +9930,8 @@ Maximum</source>
         <location filename="../core/cochran.c" line="411"/>
         <location filename="../core/cochran.c" line="418"/>
         <location filename="../core/import-csv.c" line="761"/>
-        <location filename="../core/libdivecomputer.c" line="254"/>
-        <location filename="../core/libdivecomputer.c" line="268"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="269"/>
         <location filename="../core/plannernotes.c" line="54"/>
         <source>gaschange</source>
         <translation>thay đổi dưỡng khí</translation>
@@ -9893,101 +9939,101 @@ Maximum</source>
     <message>
         <location filename="../core/cochran.c" line="367"/>
         <location filename="../core/cochran.c" line="406"/>
-        <location filename="../core/libdivecomputer.c" line="245"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="376"/>
         <location filename="../core/cochran.c" line="423"/>
-        <location filename="../core/libdivecomputer.c" line="247"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>ceiling</source>
         <translation>trần</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="392"/>
-        <location filename="../core/libdivecomputer.c" line="249"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>transmitter</source>
         <translation>máy phát radio</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="255"/>
+        <location filename="../core/datatrak.c" line="256"/>
         <source>clear</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="258"/>
+        <location filename="../core/datatrak.c" line="259"/>
         <source>misty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="261"/>
+        <location filename="../core/datatrak.c" line="262"/>
         <source>fog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="264"/>
+        <location filename="../core/datatrak.c" line="265"/>
         <source>rain</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="267"/>
+        <location filename="../core/datatrak.c" line="268"/>
         <source>storm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="270"/>
+        <location filename="../core/datatrak.c" line="271"/>
         <source>snow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="290"/>
+        <location filename="../core/datatrak.c" line="291"/>
         <source>No suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="293"/>
+        <location filename="../core/datatrak.c" line="294"/>
         <source>Shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="296"/>
+        <location filename="../core/datatrak.c" line="297"/>
         <source>Combi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="299"/>
+        <location filename="../core/datatrak.c" line="300"/>
         <source>Wet suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="302"/>
+        <location filename="../core/datatrak.c" line="303"/>
         <source>Semidry suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="305"/>
+        <location filename="../core/datatrak.c" line="306"/>
         <source>Dry suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="364"/>
+        <location filename="../core/datatrak.c" line="365"/>
         <source>no stop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="366"/>
+        <location filename="../core/datatrak.c" line="367"/>
         <location filename="../core/tag.c" line="20"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="368"/>
+        <location filename="../core/datatrak.c" line="369"/>
         <source>single ascent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="370"/>
+        <location filename="../core/datatrak.c" line="371"/>
         <source>multiple ascent</source>
         <translation type="unfinished"/>
     </message>
@@ -9997,116 +10043,116 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="372"/>
+        <location filename="../core/datatrak.c" line="373"/>
         <source>fresh water</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="374"/>
+        <location filename="../core/datatrak.c" line="375"/>
         <source>salt water</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="395"/>
+        <location filename="../core/datatrak.c" line="396"/>
         <source>sight seeing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="397"/>
+        <location filename="../core/datatrak.c" line="398"/>
         <source>club dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="399"/>
+        <location filename="../core/datatrak.c" line="400"/>
         <location filename="../core/tag.c" line="19"/>
         <source>instructor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="401"/>
+        <location filename="../core/datatrak.c" line="402"/>
         <source>instruction</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="403"/>
+        <location filename="../core/datatrak.c" line="404"/>
         <location filename="../core/tag.c" line="18"/>
         <source>night</source>
         <translation>ban đêm</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="405"/>
+        <location filename="../core/datatrak.c" line="406"/>
         <location filename="../core/tag.c" line="16"/>
         <source>cave</source>
         <translation>hang động</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="407"/>
+        <location filename="../core/datatrak.c" line="408"/>
         <location filename="../core/tag.c" line="15"/>
         <source>ice</source>
         <translation>băng</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="409"/>
+        <location filename="../core/datatrak.c" line="410"/>
         <source>search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="416"/>
+        <location filename="../core/datatrak.c" line="417"/>
         <location filename="../core/tag.c" line="16"/>
         <source>wreck</source>
         <translation>vật trôi dạt</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="418"/>
+        <location filename="../core/datatrak.c" line="419"/>
         <location filename="../core/tag.c" line="17"/>
         <source>river</source>
         <translation>sông</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="420"/>
+        <location filename="../core/datatrak.c" line="421"/>
         <location filename="../core/tag.c" line="14"/>
         <source>drift</source>
         <translation>độ trôi</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="422"/>
+        <location filename="../core/datatrak.c" line="423"/>
         <location filename="../core/tag.c" line="19"/>
         <source>photo</source>
         <translation>hình ảnh</translation>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="424"/>
+        <location filename="../core/datatrak.c" line="425"/>
         <source>other</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="434"/>
+        <location filename="../core/datatrak.c" line="435"/>
         <source>Other activities</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="458"/>
+        <location filename="../core/datatrak.c" line="459"/>
         <source>Datatrak/Wlog notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="502"/>
+        <location filename="../core/datatrak.c" line="503"/>
         <source>[Warning] Manual dive # %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="528"/>
+        <location filename="../core/datatrak.c" line="529"/>
         <source>[Error] Out of memory for dive %d. Abort parsing.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="576"/>
+        <location filename="../core/datatrak.c" line="577"/>
         <source>[Error] File is not a DataTrak file. Aborted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/datatrak.c" line="589"/>
+        <location filename="../core/datatrak.c" line="590"/>
         <source>Error: no dive</source>
         <translation type="unfinished"/>
     </message>
@@ -10156,30 +10202,30 @@ Maximum</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>OC-gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>diluent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
-        <location filename="../core/equipment.c" line="92"/>
-        <location filename="../core/planner.c" line="1158"/>
-        <location filename="../core/planner.c" line="1161"/>
+        <location filename="../core/equipment.c" line="45"/>
+        <location filename="../core/equipment.c" line="144"/>
+        <location filename="../core/planner.c" line="1179"/>
+        <location filename="../core/planner.c" line="1182"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="27"/>
+        <location filename="../core/equipment.c" line="45"/>
         <source>not used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="32"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
@@ -10192,17 +10238,17 @@ Maximum</source>
         <location filename="../core/plannernotes.c" line="72"/>
         <location filename="../core/plannernotes.c" line="73"/>
         <location filename="../core/plannernotes.c" line="74"/>
-        <location filename="../core/qthelper.cpp" line="622"/>
-        <location filename="../core/qthelper.cpp" line="814"/>
-        <location filename="../core/qthelper.cpp" line="1252"/>
+        <location filename="../core/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="625"/>
-        <location filename="../core/qthelper.cpp" line="816"/>
-        <location filename="../core/qthelper.cpp" line="1251"/>
+        <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>
@@ -10213,25 +10259,25 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1275"/>
+        <location filename="../core/qthelper.cpp" line="1277"/>
         <location filename="../core/units.c" line="65"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="538"/>
-        <location filename="../core/qthelper.cpp" line="553"/>
-        <location filename="../core/qthelper.cpp" line="732"/>
-        <location filename="../core/qthelper.cpp" line="1227"/>
+        <location filename="../core/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="541"/>
-        <location filename="../core/qthelper.cpp" line="555"/>
-        <location filename="../core/qthelper.cpp" line="734"/>
-        <location filename="../core/qthelper.cpp" line="1226"/>
+        <location filename="../core/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>
@@ -10257,86 +10303,86 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="564"/>
-        <location filename="../core/qthelper.cpp" line="574"/>
-        <location filename="../core/qthelper.cpp" line="789"/>
-        <location filename="../core/qthelper.cpp" line="1203"/>
+        <location filename="../core/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="132"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="133"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="562"/>
-        <location filename="../core/qthelper.cpp" line="572"/>
-        <location filename="../core/qthelper.cpp" line="787"/>
-        <location filename="../core/qthelper.cpp" line="1202"/>
+        <location filename="../core/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="130"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="131"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="678"/>
-        <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1154"/>
-        <location filename="../core/planner.c" line="1157"/>
+        <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>không khí</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="90"/>
+        <location filename="../core/equipment.c" line="142"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="205"/>
+        <location filename="../core/equipment.c" line="252"/>
         <source>integrated</source>
         <translation>được tích hợp</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="206"/>
+        <location filename="../core/equipment.c" line="253"/>
         <source>belt</source>
         <translation>dây ràng</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="207"/>
+        <location filename="../core/equipment.c" line="254"/>
         <source>ankle</source>
         <translation>mắt cá chân</translation>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="208"/>
+        <location filename="../core/equipment.c" line="255"/>
         <source>backplate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/equipment.c" line="209"/>
+        <location filename="../core/equipment.c" line="256"/>
         <source>clip-on</source>
         <translation>clip-on</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="116"/>
+        <location filename="../core/file.c" line="117"/>
         <source>No dives in the input file &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="334"/>
+        <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="53"/>
+        <location filename="../core/ostctools.c" line="54"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Thất bại khi đọc dữ liệu &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/file.c" line="221"/>
+        <location filename="../core/file.c" line="222"/>
         <source>Cannot open CSV file %s; please use Import log file dialog</source>
         <comment>'Import log file' should be the same text as corresponding label in Import menu</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/file.c" line="336"/>
+        <location filename="../core/file.c" line="337"/>
         <source>Empty file &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
@@ -10387,287 +10433,287 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="83"/>
+        <location filename="../core/git-access.c" line="85"/>
         <source>Checkout from storage (%lu/%lu)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="114"/>
+        <location filename="../core/git-access.c" line="116"/>
         <source>Transfer from storage (%d/%d)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="126"/>
+        <location filename="../core/git-access.c" line="128"/>
         <source>Transfer to storage (%d/%d)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="162"/>
+        <location filename="../core/git-access.c" line="164"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="185"/>
-        <location filename="../core/git-access.c" line="205"/>
+        <location filename="../core/git-access.c" line="187"/>
+        <location filename="../core/git-access.c" line="207"/>
         <source>Could not update local cache to newer remote data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="198"/>
+        <location filename="../core/git-access.c" line="200"/>
         <source>Subsurface cloud storage corrupted</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="334"/>
+        <location filename="../core/git-access.c" line="336"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="394"/>
+        <location filename="../core/git-access.c" line="396"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="424"/>
+        <location filename="../core/git-access.c" line="426"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="458"/>
+        <location filename="../core/git-access.c" line="460"/>
         <source>Remote storage and local data diverged</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="461"/>
+        <location filename="../core/git-access.c" line="463"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="470"/>
+        <location filename="../core/git-access.c" line="472"/>
         <source>Problems with local cache of Subsurface cloud data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="471"/>
+        <location filename="../core/git-access.c" line="473"/>
         <source>Moved cache data to %s. Please try the operation again.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="518"/>
+        <location filename="../core/git-access.c" line="520"/>
         <source>Update local storage to match cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="526"/>
+        <location filename="../core/git-access.c" line="528"/>
         <source>Push local changes to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="544"/>
+        <location filename="../core/git-access.c" line="546"/>
         <source>Try to merge local changes into cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="586"/>
+        <location filename="../core/git-access.c" line="588"/>
         <source>Store data into cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="610"/>
+        <location filename="../core/git-access.c" line="612"/>
         <source>Sync with cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="637"/>
+        <location filename="../core/git-access.c" line="639"/>
         <source>Can&apos;t reach cloud server, working with local data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="650"/>
+        <location filename="../core/git-access.c" line="652"/>
         <source>Successful cloud connection, fetch remote</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="669"/>
+        <location filename="../core/git-access.c" line="671"/>
         <source>Done syncing with cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="804"/>
+        <location filename="../core/git-access.c" line="806"/>
         <source>Error connecting to Subsurface cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="807"/>
+        <location filename="../core/git-access.c" line="809"/>
         <source>git clone of %s failed (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/git-access.c" line="833"/>
+        <location filename="../core/git-access.c" line="835"/>
         <source>Synchronising data file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/import-divinglog.c" line="315"/>
-        <location filename="../core/libdivecomputer.c" line="230"/>
+        <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/uemis-downloader.c" line="197"/>
+        <location filename="../core/uemis-downloader.c" line="199"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="243"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>none</source>
         <translation>không</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="248"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>workload</source>
         <translation>tải công việc</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="250"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>violation</source>
         <translation>độ xâm phạm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="251"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>bookmark</source>
         <translation>đánh dấu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="252"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>surface</source>
         <translation>bề mặt</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="253"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>safety stop</source>
         <translation>dừng an toàn</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="255"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>safety stop (voluntary)</source>
         <translation>dừng an toàn (tự nguyện)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="256"/>
+        <location filename="../core/libdivecomputer.c" line="257"/>
         <source>safety stop (mandatory)</source>
         <translation>dừng an toàn (bắt buộc)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="257"/>
+        <location filename="../core/libdivecomputer.c" line="258"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="258"/>
+        <location filename="../core/libdivecomputer.c" line="259"/>
         <source>ceiling (safety stop)</source>
         <translation>trần (độ an toàn)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="259"/>
+        <location filename="../core/libdivecomputer.c" line="260"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="260"/>
+        <location filename="../core/libdivecomputer.c" line="261"/>
         <source>divetime</source>
         <translation>thời gian lặn</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="264"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>airtime</source>
         <translation>thời gian không khí</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="265"/>
+        <location filename="../core/libdivecomputer.c" line="266"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="266"/>
+        <location filename="../core/libdivecomputer.c" line="267"/>
         <source>heading</source>
         <translation>thẳng tiến</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="267"/>
+        <location filename="../core/libdivecomputer.c" line="268"/>
         <source>tissue level warning</source>
         <translation>cảnh báo cấp độ mô</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="277"/>
+        <location filename="../core/libdivecomputer.c" line="278"/>
         <source>invalid event number</source>
         <translation>chỉ số sự kiện không hợp lệ</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="613"/>
+        <location filename="../core/libdivecomputer.c" line="614"/>
         <source>Error parsing the datetime</source>
         <translation>Lỗi khi chuyển thông số thời gian</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="631"/>
+        <location filename="../core/libdivecomputer.c" line="632"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="637"/>
+        <location filename="../core/libdivecomputer.c" line="638"/>
         <source>Error parsing the divetime</source>
         <translation>Lỗi khi chuyển thông số thời gian lặn</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
+        <location filename="../core/libdivecomputer.c" line="648"/>
         <source>Error parsing the maxdepth</source>
         <translation>Lỗi khi chuyển thông số độ sâu tối đa</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="661"/>
+        <location filename="../core/libdivecomputer.c" line="662"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="680"/>
+        <location filename="../core/libdivecomputer.c" line="681"/>
         <source>Error parsing the gas mix count</source>
         <translation>Lỗi khi chuyển tiếp thông số số lượng hỗn hợp dưỡng khí</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="691"/>
+        <location filename="../core/libdivecomputer.c" line="692"/>
         <source>Error obtaining water salinity</source>
         <translation>Lỗi khi thu nhận độ mặn của nước</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="700"/>
+        <location filename="../core/libdivecomputer.c" line="701"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
+        <location filename="../core/libdivecomputer.c" line="724"/>
         <source>Error obtaining dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="745"/>
+        <location filename="../core/libdivecomputer.c" line="746"/>
         <source>Error parsing the gas mix</source>
         <translation>Lỗi khi chuyển thông số hỗn hợp dưỡng khí</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="771"/>
+        <location filename="../core/libdivecomputer.c" line="772"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Không thể tạo việc chuyển thông số cho %s %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="778"/>
         <source>Error registering the data</source>
         <translation>Lỗi khi đăng ký dữ liệu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="808"/>
+        <location filename="../core/libdivecomputer.c" line="809"/>
         <source>Error parsing the samples</source>
         <translation>Lỗi khi chuyển thông số các mẫu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="815"/>
+        <location filename="../core/libdivecomputer.c" line="816"/>
         <source>Already downloaded dive at %s</source>
         <translation type="unfinished"/>
     </message>
@@ -10725,54 +10771,54 @@ You can create this logfile by selecting the corresponding checkbox in the downl
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="175"/>
-        <location filename="../core/parse-xml.c" line="1207"/>
+        <location filename="../core/load-git.c" line="186"/>
+        <location filename="../core/parse-xml.c" line="1208"/>
         <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="201"/>
-        <location filename="../core/parse.c" line="442"/>
+        <location filename="../core/load-git.c" line="211"/>
+        <location filename="../core/parse.c" line="443"/>
         <source>additional name for site: %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1664"/>
+        <location filename="../core/load-git.c" line="1659"/>
         <source>Load dives from local cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/load-git.c" line="1668"/>
+        <location filename="../core/load-git.c" line="1663"/>
         <source>Successfully opened dive data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="128"/>
-        <location filename="../core/ostctools.c" line="159"/>
+        <location filename="../core/ostctools.c" line="129"/>
+        <location filename="../core/ostctools.c" line="160"/>
         <source>Unknown DC in dive %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/ostctools.c" line="171"/>
+        <location filename="../core/ostctools.c" line="172"/>
         <source>Error - %s - parsing dive %d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="400"/>
+        <location filename="../core/parse-xml.c" line="401"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Đang đọc tỉ lệ lạ %s
 </translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="1664"/>
+        <location filename="../core/parse-xml.c" line="1663"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Thất bại khi chuyển thông số &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../core/parse-xml.c" line="2257"/>
+        <location filename="../core/parse-xml.c" line="2256"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation type="unfinished"/>
     </message>
@@ -10799,7 +10845,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl
     </message>
     <message>
         <location filename="../core/planner.c" line="300"/>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="193"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="194"/>
         <source>SP change</source>
         <translation type="unfinished"/>
     </message>
@@ -11066,460 +11112,460 @@ You can create this logfile by selecting the corresponding checkbox in the downl
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="881"/>
+        <location filename="../core/planner.c" line="900"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1162"/>
+        <location filename="../core/planner.c" line="1183"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1396"/>
+        <location filename="../core/profile.c" line="1406"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1407"/>
+        <location filename="../core/profile.c" line="1417"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1413"/>
+        <location filename="../core/profile.c" line="1423"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1416"/>
+        <location filename="../core/profile.c" line="1426"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1418"/>
+        <location filename="../core/profile.c" line="1428"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1427"/>
+        <location filename="../core/profile.c" line="1437"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1430"/>
+        <location filename="../core/profile.c" line="1440"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1470"/>
+        <location filename="../core/profile.c" line="1480"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1462"/>
+        <location filename="../core/profile.c" line="1472"/>
         <source>Safety stop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1403"/>
+        <location filename="../core/profile.c" line="1413"/>
         <source>P: %d%s (%s)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1420"/>
+        <location filename="../core/profile.c" line="1430"/>
         <source>pO₂: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1422"/>
+        <location filename="../core/profile.c" line="1432"/>
         <source>SCR ΔpO₂: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1425"/>
+        <location filename="../core/profile.c" line="1435"/>
         <source>pN₂: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1439"/>
+        <location filename="../core/profile.c" line="1449"/>
         <source>EAD: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1445"/>
+        <location filename="../core/profile.c" line="1455"/>
         <source>END: %d%s
 EADD: %d%s / %.1fg/ℓ
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1450"/>
+        <location filename="../core/profile.c" line="1460"/>
         <source>Density: %.1fg/ℓ
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1465"/>
+        <location filename="../core/profile.c" line="1475"/>
         <source>Safety stop: unknown time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1473"/>
+        <location filename="../core/profile.c" line="1483"/>
         <source>Deco: unknown time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1477"/>
+        <location filename="../core/profile.c" line="1487"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1479"/>
+        <location filename="../core/profile.c" line="1489"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1482"/>
+        <location filename="../core/profile.c" line="1492"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1485"/>
+        <location filename="../core/profile.c" line="1495"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1493"/>
+        <location filename="../core/profile.c" line="1503"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1496"/>
+        <location filename="../core/profile.c" line="1506"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1498"/>
+        <location filename="../core/profile.c" line="1508"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1502"/>
+        <location filename="../core/profile.c" line="1512"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1504"/>
+        <location filename="../core/profile.c" line="1514"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1507"/>
+        <location filename="../core/profile.c" line="1517"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1510"/>
+        <location filename="../core/profile.c" line="1520"/>
         <source>Surface GF %.0f%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1513"/>
+        <location filename="../core/profile.c" line="1523"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1519"/>
+        <location filename="../core/profile.c" line="1529"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1526"/>
+        <location filename="../core/profile.c" line="1536"/>
         <source>ICD in leading tissue
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1528"/>
+        <location filename="../core/profile.c" line="1538"/>
         <source>heart rate: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1530"/>
+        <location filename="../core/profile.c" line="1540"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1533"/>
+        <location filename="../core/profile.c" line="1543"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1630"/>
+        <location filename="../core/profile.c" line="1640"/>
         <source>ΔT:%d:%02dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1634"/>
+        <location filename="../core/profile.c" line="1644"/>
         <source>%s ΔD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1638"/>
+        <location filename="../core/profile.c" line="1648"/>
         <source>%s ↓D:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1642"/>
+        <location filename="../core/profile.c" line="1652"/>
         <source>%s ↑D:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1646"/>
+        <location filename="../core/profile.c" line="1656"/>
         <source>%s øD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1650"/>
+        <location filename="../core/profile.c" line="1660"/>
         <source>%s ↓V:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1654"/>
+        <location filename="../core/profile.c" line="1664"/>
         <source>%s ↑V:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1658"/>
+        <location filename="../core/profile.c" line="1668"/>
         <source>%s øV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1665"/>
+        <location filename="../core/profile.c" line="1675"/>
         <source>%s ΔP:%d%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/profile.c" line="1690"/>
+        <location filename="../core/profile.c" line="1700"/>
         <source>%s SAC:%.*f%s/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="68"/>
+        <location filename="../core/qthelper.cpp" line="70"/>
         <source>%1km</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="70"/>
+        <location filename="../core/qthelper.cpp" line="72"/>
         <source>%1m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="74"/>
+        <location filename="../core/qthelper.cpp" line="76"/>
         <source>%1mi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="76"/>
+        <location filename="../core/qthelper.cpp" line="78"/>
         <source>%1yd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="234"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="236"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="94"/>
-        <location filename="../core/qthelper.cpp" line="235"/>
+        <location filename="../core/qthelper.cpp" line="96"/>
+        <location filename="../core/qthelper.cpp" line="237"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="236"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="238"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="95"/>
-        <location filename="../core/qthelper.cpp" line="237"/>
+        <location filename="../core/qthelper.cpp" line="97"/>
+        <location filename="../core/qthelper.cpp" line="239"/>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="583"/>
-        <location filename="../core/qthelper.cpp" line="760"/>
+        <location filename="../core/qthelper.cpp" line="585"/>
+        <location filename="../core/qthelper.cpp" line="762"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="586"/>
-        <location filename="../core/qthelper.cpp" line="762"/>
+        <location filename="../core/qthelper.cpp" line="588"/>
+        <location filename="../core/qthelper.cpp" line="764"/>
         <source>F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="837"/>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>AIR</source>
         <translation>KHÔNG KHÍ</translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="839"/>
+        <location filename="../core/qthelper.cpp" line="841"/>
         <source>EAN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="914"/>
+        <location filename="../core/qthelper.cpp" line="916"/>
         <source>more than %1 days</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../core/qthelper.cpp" line="960"/>
+        <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
         <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1179"/>
+        <location filename="../core/qthelper.cpp" line="1181"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/qthelper.cpp" line="1274"/>
+        <location filename="../core/qthelper.cpp" line="1276"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="480"/>
-        <location filename="../core/save-html.c" line="564"/>
-        <location filename="../core/worldmap-save.c" line="114"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="499"/>
+        <location filename="../core/save-html.c" line="501"/>
         <source>Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="500"/>
+        <location filename="../core/save-html.c" line="502"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="501"/>
+        <location filename="../core/save-html.c" line="503"/>
         <source>Time</source>
         <translation>Thời gian</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="502"/>
+        <location filename="../core/save-html.c" line="504"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="503"/>
+        <location filename="../core/save-html.c" line="505"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="504"/>
+        <location filename="../core/save-html.c" line="506"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="507"/>
         <source>Dives</source>
         <translation>Lần lặn</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="506"/>
+        <location filename="../core/save-html.c" line="508"/>
         <source>Expand all</source>
         <translation>Mở rộng tất cả</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="507"/>
+        <location filename="../core/save-html.c" line="509"/>
         <source>Collapse all</source>
         <translation>Mở ra tất cả</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="508"/>
+        <location filename="../core/save-html.c" line="510"/>
         <source>Trips</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../core/save-html.c" line="511"/>
         <source>Statistics</source>
         <translation>Thống kê</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="510"/>
+        <location filename="../core/save-html.c" line="512"/>
         <source>Advanced search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="513"/>
+        <location filename="../core/save-html.c" line="515"/>
         <source>Rating</source>
         <translation>Xếp hạng</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="514"/>
+        <location filename="../core/save-html.c" line="516"/>
         <source>Visibility</source>
         <translation>Tầm nhìn</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="515"/>
+        <location filename="../core/save-html.c" line="517"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="516"/>
+        <location filename="../core/save-html.c" line="518"/>
         <source>Divemaster</source>
         <translation>Người lặn giỏi nhất</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="517"/>
+        <location filename="../core/save-html.c" line="519"/>
         <source>Buddy</source>
         <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="518"/>
+        <location filename="../core/save-html.c" line="520"/>
         <source>Suit</source>
         <translation>Đồ lặn</translation>
     </message>
@@ -11530,180 +11576,180 @@ EADD: %d%s / %.1fg/ℓ
     </message>
     <message>
         <location filename="../core/divesite-helper.cpp" line="29"/>
-        <location filename="../core/save-html.c" line="519"/>
+        <location filename="../core/save-html.c" line="521"/>
         <source>Tags</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="520"/>
+        <location filename="../core/save-html.c" line="522"/>
         <location filename="../smtk-import/smartrak.c" line="257"/>
         <location filename="../smtk-import/smartrak.c" line="330"/>
         <source>Notes</source>
         <translation>Ghi chú</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="521"/>
+        <location filename="../core/save-html.c" line="523"/>
         <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="524"/>
+        <location filename="../core/save-html.c" line="526"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="525"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Year</source>
         <translation>Năm</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="526"/>
+        <location filename="../core/save-html.c" line="528"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="527"/>
+        <location filename="../core/save-html.c" line="529"/>
         <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="528"/>
+        <location filename="../core/save-html.c" line="530"/>
         <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="529"/>
+        <location filename="../core/save-html.c" line="531"/>
         <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="530"/>
+        <location filename="../core/save-html.c" line="532"/>
         <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="531"/>
+        <location filename="../core/save-html.c" line="533"/>
         <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="532"/>
+        <location filename="../core/save-html.c" line="534"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="533"/>
+        <location filename="../core/save-html.c" line="535"/>
         <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="534"/>
+        <location filename="../core/save-html.c" line="536"/>
         <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="537"/>
         <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="536"/>
+        <location filename="../core/save-html.c" line="538"/>
         <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="537"/>
+        <location filename="../core/save-html.c" line="539"/>
         <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="538"/>
+        <location filename="../core/save-html.c" line="540"/>
         <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="539"/>
+        <location filename="../core/save-html.c" line="541"/>
         <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="542"/>
+        <location filename="../core/save-html.c" line="544"/>
         <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="543"/>
+        <location filename="../core/save-html.c" line="545"/>
         <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="544"/>
+        <location filename="../core/save-html.c" line="546"/>
         <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="545"/>
+        <location filename="../core/save-html.c" line="547"/>
         <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="546"/>
-        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="555"/>
         <source>Type</source>
         <translation>Loại</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="547"/>
+        <location filename="../core/save-html.c" line="549"/>
         <source>Size</source>
         <translation>Kích thước</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="548"/>
+        <location filename="../core/save-html.c" line="550"/>
         <source>Work pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="549"/>
+        <location filename="../core/save-html.c" line="551"/>
         <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="550"/>
+        <location filename="../core/save-html.c" line="552"/>
         <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="551"/>
+        <location filename="../core/save-html.c" line="553"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="552"/>
+        <location filename="../core/save-html.c" line="554"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="554"/>
+        <location filename="../core/save-html.c" line="556"/>
         <source>Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="555"/>
+        <location filename="../core/save-html.c" line="557"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="556"/>
+        <location filename="../core/save-html.c" line="558"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="557"/>
+        <location filename="../core/save-html.c" line="559"/>
         <source>Coordinates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-html.c" line="558"/>
+        <location filename="../core/save-html.c" line="560"/>
         <source>Dive status</source>
         <translation type="unfinished"/>
     </message>
@@ -11723,17 +11769,17 @@ EADD: %d%s / %.1fg/ℓ
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/dive.c" line="29"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="34"/>
+        <location filename="../core/dive.c" line="30"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/dive.c" line="35"/>
+        <location filename="../core/dive.c" line="31"/>
         <source>Freedive</source>
         <translation type="unfinished"/>
     </message>
@@ -11743,177 +11789,177 @@ EADD: %d%s / %.1fg/ℓ
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jan</source>
         <translation>Th1</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Feb</source>
         <translation>Th2</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Mar</source>
         <translation>Th3</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>May</source>
         <translation>Th5</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="116"/>
+        <location filename="../core/subsurfacestartup.c" line="118"/>
         <source>Jun</source>
         <translation>Th6</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Jul</source>
         <translation>Th7</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Aug</source>
         <translation>Th8</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Sep</source>
         <translation>Th9</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Oct</source>
         <translation>Th10</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Nov</source>
         <translation>Th11</translation>
     </message>
     <message>
-        <location filename="../core/subsurfacestartup.c" line="117"/>
+        <location filename="../core/subsurfacestartup.c" line="119"/>
         <source>Dec</source>
         <translation>Th12</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="32"/>
+        <location filename="../core/uemis-downloader.c" line="34"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="33"/>
+        <location filename="../core/uemis-downloader.c" line="35"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="34"/>
+        <location filename="../core/uemis-downloader.c" line="36"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="35"/>
+        <location filename="../core/uemis-downloader.c" line="37"/>
         <source>No dives to download.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="499"/>
+        <location filename="../core/uemis-downloader.c" line="501"/>
         <source>%s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="535"/>
+        <location filename="../core/uemis-downloader.c" line="537"/>
         <source>data</source>
         <translation>dữ liệu</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="563"/>
+        <location filename="../core/uemis-downloader.c" line="565"/>
         <source>dive log #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="565"/>
+        <location filename="../core/uemis-downloader.c" line="567"/>
         <source>dive spot #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="567"/>
+        <location filename="../core/uemis-downloader.c" line="569"/>
         <source>details for #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>wetsuit</source>
         <translation>wetsuit</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>semidry</source>
         <translation>ít ướt</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="795"/>
+        <location filename="../core/uemis-downloader.c" line="797"/>
         <source>drysuit</source>
         <translation>đồ khô</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>shorty</source>
         <translation>ngắn</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>vest</source>
         <translation>áo khoác</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>long john</source>
         <translation>long john</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>jacket</source>
         <translation>jacket</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>full suit</source>
         <translation>thiết bị đầy đủ</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="796"/>
+        <location filename="../core/uemis-downloader.c" line="798"/>
         <source>2 pcs full suit</source>
         <translation>2 bộ pcs đầy đủ</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="797"/>
+        <location filename="../core/uemis-downloader.c" line="799"/>
         <source>membrane</source>
         <translation>lớp màng</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1336"/>
+        <location filename="../core/uemis-downloader.c" line="1338"/>
         <source>Initialise communication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1339"/>
+        <location filename="../core/uemis-downloader.c" line="1341"/>
         <source>Uemis init failed</source>
         <translation>Thất bại cho việc thiết lập Uemis</translation>
     </message>
     <message>
-        <location filename="../core/uemis-downloader.c" line="1351"/>
+        <location filename="../core/uemis-downloader.c" line="1353"/>
         <source>Start download</source>
         <translation>Bắt đầu tải xuống</translation>
     </message>
@@ -12008,76 +12054,76 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="42"/>
+        <location filename="../core/worldmap-save.c" line="44"/>
         <source>Date:</source>
         <translation>Ngày tháng:</translation>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="44"/>
+        <location filename="../core/worldmap-save.c" line="46"/>
         <source>Time:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="46"/>
+        <location filename="../core/worldmap-save.c" line="48"/>
         <source>Duration:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
+        <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="140"/>
-        <location filename="../core/worldmap-save.c" line="47"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
+        <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>nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="140"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="100"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="104"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="56"/>
-        <location filename="../core/divelogexportlogic.cpp" line="94"/>
-        <location filename="../core/qthelper.h" line="76"/>
-        <location filename="../desktop-widgets/templatelayout.h" line="101"/>
+        <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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/divelogexportlogic.cpp" line="152"/>
+        <location filename="../core/divelogexportlogic.cpp" line="153"/>
         <source>Cannot find a folder called &apos;theme&apos; in the standard locations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="50"/>
+        <location filename="../core/worldmap-save.c" line="52"/>
         <source>Max. depth:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="53"/>
+        <location filename="../core/worldmap-save.c" line="55"/>
         <source>Air temp.:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="56"/>
+        <location filename="../core/worldmap-save.c" line="58"/>
         <source>Water temp.:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="58"/>
+        <location filename="../core/worldmap-save.c" line="60"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/worldmap-save.c" line="62"/>
+        <location filename="../core/worldmap-save.c" line="64"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
@@ -12197,27 +12243,27 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="914"/>
+        <location filename="../core/save-git.c" line="916"/>
         <source>Start saving data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="923"/>
+        <location filename="../core/save-git.c" line="925"/>
         <source>Start saving dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="956"/>
+        <location filename="../core/save-git.c" line="958"/>
         <source>Done creating local cache</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-git.c" line="1207"/>
+        <location filename="../core/save-git.c" line="1209"/>
         <source>Preparing to save data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1661"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1658"/>
         <source>modechange</source>
         <translation type="unfinished"/>
     </message>
@@ -12232,57 +12278,57 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="558"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="559"/>
         <source>Don&apos;t save an empty log to the cloud</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="46"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="47"/>
         <source>Average</source>
         <translation>Trung bình</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="49"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="50"/>
         <source>Minimum</source>
         <translation>Nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/simplewidgets.cpp" line="52"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="53"/>
         <source>Maximum</source>
         <translation>Tối đa</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="404"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="406"/>
         <source>Invalid response from server</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="414"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="458"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="460"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="465"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="467"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="121"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="122"/>
         <source>/min</source>
         <translation>/nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="743"/>
+        <location filename="../core/save-xml.c" line="749"/>
         <source>Failed to save dives to %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/save-xml.c" line="864"/>
+        <location filename="../core/save-xml.c" line="871"/>
         <source>Failed to save divesites to %s (%s)</source>
         <translation type="unfinished"/>
     </message>