Pull latest translations

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
author: Dirk Hohndel <dirk@hohndel.org> 2015-10-27 15:23:39 +0900
committer: Dirk Hohndel <dirk@hohndel.org> 2015-10-27 15:23:39 +0900
commit: 5b08705f39becbe794f3e140213ce4932b49b7c9 (patch)
tree: 03a1f2ff6441b0e49c18d7c7c901504360eee8b2 /translations
parent: 3b419b3d075be3ab66d23c49c5ad76be5075d37b (diff)
download: subsurface-5b08705f39becbe794f3e140213ce4932b49b7c9.tar.gz
29 files changed, 10213 insertions, 9734 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index dd2f729dc..d5a40b031 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Лице:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Търсене за партньори и водачи</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Използвaне</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Кликнете тук за да изтриете бутилка</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Бутилката не може да бъде премахната</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Този газ се използвза. Само бутилки, които не се използват в гмуркането могат да бъдат премахнати.</translation>
     </message>
@@ -1899,104 +1899,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>№</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Оценка</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Дълбочина(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>м</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>фута</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Продълж. (мин.)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Температура(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Тежест(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>кг</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>паунда</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Водолазен костюм</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Бут.</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Газ</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/м</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Макс. CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Местонахождение</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Създай ново място на гмуркане и копирай информация от текущото гмуркане.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Създай ново място на гмуркане с име</translation>
     </message>
@@ -2788,32 +2690,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Финална дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Teчащо време</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Използван газ</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Тежест(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Бут.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Газ</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/м</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Дълбочина(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Температура(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3536,7 +3438,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Местонахождение: </translation>
     </message>
@@ -3662,7 +3564,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Редакция на мяста за гмуркане</translation>
     </message>
@@ -3684,7 +3586,7 @@ p, li { white-space: pre-wrap; }
 Сигурни ли сте че искате да продължите?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Вие редактирате място за гмуркане</translation>
     </message>
@@ -3994,6 +3896,26 @@ p, li { white-space: pre-wrap; }
         <translation>Добави система за тежест</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Tемп. на въздуха [%1]</translation>
@@ -4031,69 +3953,69 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Най-дълбоко гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Най-плитко гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Най-висок SAC на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Най-нисък SAC на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Среден SAC на всички избрани гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Най-висока температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Най-ниска температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Средна температура на всички избрани гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Най-дълго гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Най-късо гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Средна дължина на избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4102,22 +4024,22 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Ново място за гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Изтрий промените?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Вие ще изтриете промените.</translation>
     </message>
@@ -4270,7 +4192,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Отвори</translation>
     </message>
@@ -4523,7 +4445,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>&amp;Отмени</translation>
     </message>
@@ -4536,7 +4458,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>&amp;Върни</translation>
     </message>
@@ -4771,143 +4693,143 @@ mixed from Air and using:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Отвори файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Отмяна</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Обходи папки с изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Сканирай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Сканиране за изборажения...(това може да отнеме доста време)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Моля затворете текущата редакция на гмуркане преди да затворите файла.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Моля запишете или отменете текущата редакция на гмуркане преди да добавите гмуркане.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Напечатай рунтайм таблица</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Опит за редакция на гмуркане, което не е ръчно добавено.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Желаете ли да запишете промените във файла %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Желаете ли да запишете промените във файла с данни?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Запиши промените?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Запиши файла като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[облаков склад за] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Отваряне на файл от стара версия</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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>Вие отворихте файл от стара версия на Subsurface. Моля прочетете Ръковордството на потребителя за да разберете за промените в новата версия и конкретно за редакцията на места за гмуркане. Subsurface вече се опита да попълни данните автоматично, но би било добре да проверите дали местата за гмуркане са правилни.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Отвори регистър файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Регистър файлове (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran файлове (*.can *.CAN);;CSV файлове (*.csv *.CSV);;DiveLog.de файлове (*.dld *.DLD);;JDiveLog файлове (*.jlb *.JLB);;Liquivision файлове (*.lvd *.LVD);;MkVI файлове (*.txt *.TXT);;Suunto файлове (*.sde *.db *.SDE *.DB);;Divesoft файлове (*.dlf *.DLF);;UDDF/UDCF файлове (*.uddf *.udcf *.UDDF *.UDCF);;XML файлове (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog файлове (*.log *.LOG);;OSTCtools файлове (*.dive *.DIVE);;Всички файлове (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Връзване към обклаковия склад...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Промените ще бъдат изгубени ако не ги запишете.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Моля запишете или отменете текущата редакция на гмуркане преди да отворите нов файл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Опит за плануване на гмуркане, което не е планувано гмуркане.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Годишни статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation>
     </message>
@@ -4925,7 +4847,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Филтърът показва %1 (от %2) гмуркания</translation>
     </message>
@@ -6043,12 +5965,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>Въздух</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>КИСЛОРОД</translation>
     </message>
@@ -6088,42 +6010,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>кб.фута</translation>
     </message>
@@ -6598,7 +6531,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Костюми:</translation>
     </message>
@@ -6625,7 +6558,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Тагове:</translation>
     </message>
@@ -6819,17 +6752,10 @@ Not all images have timestamps in the range between
         <translation>color6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Искате ли да запишете промените?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>Вие ще промените шаблон пакетиран със Subsurface.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6913,10 +6839,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation>(%1 показани)</translation>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>№</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Дълбочина(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>м</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>фута</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Продълж. (мин.)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Температура(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Тежест(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>кг</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>паунда</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Водолазен костюм</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Бут.</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Газ</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/м</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Макс. CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7014,8 +7035,8 @@ Not all images have timestamps in the range between
         <translation>Ръководство за потребителя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Начъчника на Subsurface не може да бъде намерен</translation>
     </message>
@@ -7430,7 +7451,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Грешка при рaзряд на хедър</translation>
     </message>
@@ -7509,7 +7530,7 @@ Maximum</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
@@ -7613,7 +7634,7 @@ Maximum</source>
         <translation>Няма подходящ Л.К. за файла &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>няма</translation>
     </message>
@@ -7621,7 +7642,7 @@ Maximum</source>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>деко. стоп</translation>
     </message>
@@ -7634,7 +7655,7 @@ Maximum</source>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7642,45 +7663,45 @@ Maximum</source>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>покачване</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>таван</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>натовареност</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>предавател</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>нарушение</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>бележка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>повърхност</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>безопасен стоп</translation>
     </message>
@@ -7689,193 +7710,193 @@ Maximum</source>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>смяна на газ</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>безопасен стоп (свободен)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>безопасен стоп (задължителен)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>дълбочина на спиране</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>таван (безопасен стоп)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>под</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>макс. дълбочина</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>време за въздух</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>посока</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>внимание: ниво на тъканта</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>нон стоп време</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>грешен номер на събитие</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Не може да бъде създаден разряд за %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Грешка при регистриране на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Грешка при разряд на дата и час</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Гмуркане №%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Грешка при рaзряд на време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Грешка при рaзряд на максимална дълбочина</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Грешка при рaзряд на температура</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Грешка при рaзряд на газ микс брой</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Грешка при прием на водна соленост</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Грешка при прием на повърхностно налягане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Грешка при прием на режим на гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Грешка при рaзряд на газ микс</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Грешка при рaзряд на стойности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Събитие: изчаквание на действие от потребителя</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Грешка при регистриране на направление за събития</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Грешка при регистриране на направление за отменяне</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Грешка при вход на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Не може да бъде създаден libdivecomputer контекст</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Не може да бъдe отворен %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Недостатъчни привилегии да бъде отврено устройсто %s %s (%s)</translation>
     </message>
@@ -8087,7 +8108,7 @@ Maximum</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8096,70 +8117,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/мин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fбара
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fбара
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8168,7 +8189,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8177,14 +8198,14 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Стоп: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Стоп: неопр. време @ %.0f%s
@@ -8192,156 +8213,156 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: неопр. време @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>В Deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %uмин @ %.0f%s (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>В Deco (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %uмин (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2ч (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %uмин (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2ч (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Калкулиран таван %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Тъкан %.0fмин: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>пулс: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>лагер: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>средна дълбочина до %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d мин</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8376,16 +8397,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 гмуркания)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 гмуркане)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>кораб</translation>
@@ -8659,42 +8670,47 @@ EADD: %d%s
         <translation>повече от %d дни</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dд %dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>за гмуркания №</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>за избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>за гмуркане №%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>за избраните гмуркане</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>за вички гмуркания</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(няма гмуркания)</translation>
     </message>
@@ -8794,7 +8810,7 @@ EADD: %d%s
         <translation>Дек</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_cs.ts b/translations/subsurface_cs.ts
index f0b986a08..f4b6344eb 100644
--- a/translations/subsurface_cs.ts
+++ b/translations/subsurface_cs.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Osoba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Hledání společníků při potápění a učitelů potápění (vedoucích skupiny)</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Použít</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klepnutí zde odstraní tuto láhev.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Láhev nelze odstranit</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Tento plyn se používá. Lze odstranit jen ty láhve, jež nejsou při potápění používány.</translation>
     </message>
@@ -1898,104 +1898,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Hodnocení</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Hloubka (%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation> m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>st</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Délka</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Teplota (%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Váha (%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>libra US</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Oblek</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Láhev</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Plyn</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>Spotřeba plynu (%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Max. CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Místo</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2096,12 +1998,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation type="unfinished"/>
     </message>
@@ -2787,32 +2689,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Konečná hloubka</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Doba potápění</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Délka</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Spotřeba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3017,127 +2919,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>Číslo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Hodnocení</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Hloubka</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Váha</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>Spotřeba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>st</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Váha (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Láhev</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Plyn</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>Spotřeba plynu (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Místo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Hloubka (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Délka</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Teplota (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>libra US</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3528,7 +3430,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Místo: </translation>
     </message>
@@ -3654,7 +3556,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation type="unfinished"/>
     </message>
@@ -3675,7 +3577,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -3985,6 +3887,26 @@ p, li { white-space: pre-wrap; }
         <translation>Přidat závaží</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Teplota vzduchu [%1]</translation>
@@ -4022,69 +3944,69 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Nejhlubší potápění</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Nejméně hluboké potápění</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Nejvyšší celková spotřeba plynu (SAC) potápění</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Nejnižší celková spotřeba plynu (SAC) potápění</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Průměrná celková spotřeba plynu (SAC) všech vybraných potápění</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Nejvyšší teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Nejnižší teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Průměrná teplota všech vybraných potápění</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Nejdelší potápění</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Nejkratší potápění</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Průměrná délka všech vybraných potápění</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4092,22 +4014,22 @@ mixed from Air and using:
 ze vzduchu a následujících plynů:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation> a </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Zahodit změny?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Chystáte se zahodit změny.</translation>
     </message>
@@ -4260,7 +4182,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
@@ -4513,7 +4435,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
@@ -4526,7 +4448,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
@@ -4761,143 +4683,143 @@ ze vzduchu a následujících plynů:</translation>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Prohledat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Uložte, prosím, nebo zrušte nynější upravování potápění před zavřením souboru.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Uložte, prosím, nebo zrušte nynější upravování potápění před pokusem o přidání potápění.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Vypsat provozní tabulku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Chcete uložit změny provedené v souboru %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Chcete uložit změny provedené v souboru s daty?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Uložit změny?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Uložit soubor jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Otevřít soubor se záznamem o potápění</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Změny budou ztraceny, pokud je neuložíte.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Varování</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Uložte, prosím, nebo zrušte nynější upravování potápění před otevřením nového souboru.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Roční statistiky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Soubory Subsurface XML (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Nejprve, prosím, skončete nynější upravování před pokusem o provádění dalších úprav.</translation>
     </message>
@@ -4915,7 +4837,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filtr ukazuje %1 (z %2) potápění</translation>
     </message>
@@ -6031,12 +5953,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>VZDUCH</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>KYSLÍK</translation>
     </message>
@@ -6076,42 +5998,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>libra US</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>st</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation> m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cu stopa</translation>
     </message>
@@ -6585,7 +6518,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Obleky:</translation>
     </message>
@@ -6612,7 +6545,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Značky:</translation>
     </message>
@@ -6806,16 +6739,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6899,10 +6826,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>Číslo</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Hodnocení</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Hloubka (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation> m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>st</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Délka</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Teplota (%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Váha (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>libra US</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Oblek</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Láhev</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Směs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>Spotřeba plynu (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Max. CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Místo</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7000,8 +7022,8 @@ Not all images have timestamps in the range between
         <translation>Uživatelská příručka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Nelze najít příručku pro Subsurface</translation>
     </message>
@@ -7416,7 +7438,7 @@ Průměr</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7495,7 +7517,7 @@ Průměr</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) nebo (%s)</translation>
     </message>
@@ -7599,7 +7621,7 @@ Průměr</translation>
         <translation>Pro soubor &apos;%s&apos; nebyl nalezen odpovídající počítač</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>žádný</translation>
     </message>
@@ -7607,7 +7629,7 @@ Průměr</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>dekompresní zastávka</translation>
     </message>
@@ -7620,7 +7642,7 @@ Průměr</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7628,45 +7650,45 @@ Průměr</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>výstup</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>strop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>zátěž</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>vysílač</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>překročení</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>záložka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>povrch</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>bezpečnostní zastávka</translation>
     </message>
@@ -7675,193 +7697,193 @@ Průměr</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>změna plynu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>bezpečnostní zastávka (dobrovolná)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>bezpečnostní zastávka (povinná)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>hloubková zastávka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>strop (bezpečnostní zastávka)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>čas potápění</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>pod stropem</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>největší hloubka</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>čas na vzduchu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>směr</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>upozornění na nasycení tkaniv</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>non stop čas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>neplatné číslo události</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Nelze zpracovat %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Chyba registrace dat</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Chyba při zpracování času</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Potápění #%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Chyba při zpracování času potápění</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Chyba při zpracování největší hloubky</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Chyba při zpracování teploty</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Chyba při zpracování dýchacích směsí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Chyba při získávání slanosti vody</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Chyba při získávání tlaku na povrchu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Chyba při získávání režimu potápění</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Chyba při zpracování směsi plynu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Chyba při zpracování vzorků</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Událost: Čekání na vstup uživatele</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Chyba při zavádění dat o potápění</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Potíže při inicializaci libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nelze otevřít %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Nedostatečná oprávnění k otevření zařízení %s %s (%s)</translation>
     </message>
@@ -8071,7 +8093,7 @@ Průměr</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8080,70 +8102,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>Spotřeba plynu (SAC): %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8152,7 +8174,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8161,165 +8183,165 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Bezpečnostní zastávka: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Bezpečnostní zastávka: neznáma @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Dekomprese: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Dekomprese: Neznámý čas @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>Dekomprese
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Dekomprese: %umin @ %.0f%s (spočítáno)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>Dekomprese (spočítáno)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Vypočítaný strop %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>tep srdce: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>směr: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8354,16 +8376,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 potápění)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 potápění)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>z lodi</translation>
@@ -8637,42 +8649,47 @@ EADD: %d%s
         <translation>víc než %d dní</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>pro potápění</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>pro vybraná potápění</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>pro potápění #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>pro vybrané potápění</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>pro všechna potápění</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(žádná potápění)</translation>
     </message>
@@ -8772,7 +8789,7 @@ EADD: %d%s
         <translation>pro</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts
index 2d0d495c8..1162474a4 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Person:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Søger efter makkere og divemasters</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Brug</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klik her vil fjerne flasken</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasken kan ikke fjernes</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Denne gas er i brug. Kun flasker som ikke bruges i dykket, kan fjernes</translation>
     </message>
@@ -1899,104 +1899,6 @@ fjerne den valgte dykkercomputer?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Bedømmelse</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Dybde(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Varighed</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temp(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Vægt(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Dragt</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Cyl</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Maks CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Placering</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Opret ny dykker lokation med dette navn</translation>
     </message>
@@ -2788,32 +2690,32 @@ fjerne den valgte dykkercomputer?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Slut dybde</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Brugt gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3018,127 +2920,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Bedømmelse</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Vægt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>fod</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Vægt(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Dragt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Lokation</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Dybde(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3529,7 +3431,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Sted:</translation>
     </message>
@@ -3655,7 +3557,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation type="unfinished"/>
     </message>
@@ -3676,7 +3578,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -3986,6 +3888,26 @@ p, li { white-space: pre-wrap; }
         <translation>Tilføj vægt system</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Luft temp. [%1]</translation>
@@ -4023,69 +3945,69 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Dybeste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Laveste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Højeste total SAC på et dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Laveste total SAC på det dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Gennemsnitlig total SAC for alle valgte dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Højeste temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Laveste temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Gennemsnitlig temperatur af alle valgte dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Længste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Korteste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Gennemsnit længde af alle valgte dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4094,22 +4016,22 @@ blandes fra Luft ved brug:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>og</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Drop ændringerne?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Du er ved at droppe dine ændringer.</translation>
     </message>
@@ -4262,7 +4184,7 @@ blandes fra Luft ved brug:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Åben</translation>
     </message>
@@ -4515,7 +4437,7 @@ blandes fra Luft ved brug:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>&amp;Fortryd</translation>
     </message>
@@ -4528,7 +4450,7 @@ blandes fra Luft ved brug:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
@@ -4763,143 +4685,143 @@ blandes fra Luft ved brug:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Åben fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Fortryd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Skan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Skanner billeder...(dette kan tage noget tid)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Gem eller fortryd venligst denne rettelse før du lukker filen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Gem eller fortryd venligst dette dyk før du tilføjer et dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Print runtime skema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Vil du gemme ændringerne du foretog på denne fil %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Vil du gemme ændringerne du foretog på data filen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Gem ændringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Gem fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Åben log fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Ændringer vil blive tabt hvis du ikke gemmer dem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Gem eller fortryd venligst det aktuelle dyk før du åbner en ny fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Årlig statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Færdiggør denne rettelse inden du starter på en ny.</translation>
     </message>
@@ -4917,7 +4839,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filtrer visning %1(af %2) dyk</translation>
     </message>
@@ -6033,12 +5955,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>ILT</translation>
     </message>
@@ -6078,42 +6000,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>min.</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6586,7 +6519,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Dragte:</translation>
     </message>
@@ -6613,7 +6546,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Tags:</translation>
     </message>
@@ -6807,16 +6740,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6900,10 +6827,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Bedømmelse</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Dybde(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Varighed</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temp(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Vægt(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Dragt</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Cyl</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Maks CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Placering</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7001,8 +7023,8 @@ Not all images have timestamps in the range between
         <translation>Bruger manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Kan ikke finde Subsurface manualen</translation>
     </message>
@@ -7414,7 +7436,7 @@ Gennemsnit</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7493,7 +7515,7 @@ Gennemsnit</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
@@ -7597,7 +7619,7 @@ Gennemsnit</translation>
         <translation>Ingen DC passer til filen &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>Ingen</translation>
     </message>
@@ -7605,7 +7627,7 @@ Gennemsnit</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>deco stop</translation>
     </message>
@@ -7618,7 +7640,7 @@ Gennemsnit</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7626,45 +7648,45 @@ Gennemsnit</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>opstigning</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>Loft</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>Arbejdsbyrde</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>Sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>Overtrædelse</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>bogmærke</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>overflade</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>sikkerhedsstop</translation>
     </message>
@@ -7673,193 +7695,193 @@ Gennemsnit</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>gasskifte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>Sikkerhedsstop (frivillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>Sikkerhedsstop (Krævet)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>dybe stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>Loft (sikkerhedsstop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>dykketid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>Under gulv</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>Maks. dybde</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>Lufttid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>Overskrift</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>Vævs advarsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>non stop time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>Ugyldigt hændelses nummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Kan ikke oprette parser for %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Fejl i registrering af data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Fejl ved fortolkning af dato/tid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Dyk %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Fejl i fortolkning af dykkertid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fejl i fortolkning af max dybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Fejl ved læsning af temperatur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fejl i fortolkning af antallet af gasser</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Fejl i læsning af saltindhold i vandet</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fejl ved at opnå overflade tryk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Fejl i fortolkning af gas blanding</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Fejl i fortolkning af prøver</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Event: waiting for user action</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Fejl: registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fejl: registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Import fejl i dykker data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan ikke danne libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Kan ikke åbne %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Utilstrækkelige privilegier til at åbne enheden %s %s (%s)</translation>
     </message>
@@ -8070,7 +8092,7 @@ Gennemsnit</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8080,7 +8102,7 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
@@ -8088,21 +8110,21 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
@@ -8110,42 +8132,42 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8154,7 +8176,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8163,161 +8185,161 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sikkerhedsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sikkerhedsstop: ukendt tid @ %.0f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>I deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>In deko (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Beregnet loft %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Væv %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>Hjertefrekvens: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>bærende: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s
 </translation>
@@ -8353,16 +8375,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 dyk)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 dyk)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>Båd</translation>
@@ -8636,42 +8648,47 @@ EADD: %d%s
         <translation>mere end %d dage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>for dyk #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>for de valgte dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>for dyk #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>for valgt dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>for alle dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(ingen dyk)</translation>
     </message>
@@ -8771,7 +8788,7 @@ EADD: %d%s
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index eb55cf765..ad57b63d8 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Person: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Sucht nach Buddies und Divemasters</translation>
     </message>
@@ -1717,17 +1717,17 @@
         <translation>Verwenden</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Hier klicken entfernt diese Flasche.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <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>
@@ -1899,104 +1899,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>Nr.</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Bewertung</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Tiefe(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Dauer</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temp(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Gewicht(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>US Pfund</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Anzug</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Flasche</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Max. CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Ort</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Einen neuen Tauchplatz, basierend auf den Daten des aktuellen Tauchplatz, erstellen.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Neuer Tauchplatz mit diesem Name anlegen</translation>
     </message>
@@ -2788,32 +2690,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC Sollwert</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Gewicht(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Tiefe(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3536,7 +3438,7 @@ bitte sende Folgendes an die Entwickler.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Ort:</translation>
     </message>
@@ -3662,7 +3564,7 @@ bitte sende Folgendes an die Entwickler.
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Tauchplatzverwaltung</translation>
     </message>
@@ -3684,7 +3586,7 @@ bitte sende Folgendes an die Entwickler.
 Möchtest Du fortfahren?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Du bearbeitest einen Tauchplatz</translation>
     </message>
@@ -3994,6 +3896,26 @@ Möchtest Du fortfahren?</translation>
         <translation>Gewicht hinzufügen</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Lufttemp. [%1]</translation>
@@ -4031,69 +3953,69 @@ Möchtest Du fortfahren?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Tiefster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Flachster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Höchster gesamt SAC eines Tauchganges</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Niedrigster gesamt SAC eines Tauchganges</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Durchschnittlicher gesamt SAC aller ausgewählter Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Höchste Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Niedrigste Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Durchschnittstemperatur aller ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Längster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Kürzester Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Durchschnittsdauer aller ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4102,22 +4024,22 @@ den folgenden Gasen gemischt werden:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>und</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Neuer Tauchplatz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Änderungen verwerfen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Du bist im Begriff, die Änderungen zu Verwerfen.</translation>
     </message>
@@ -4270,7 +4192,7 @@ den folgenden Gasen gemischt werden:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
@@ -4523,7 +4445,7 @@ den folgenden Gasen gemischt werden:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>R&amp;ueckgängig</translation>
     </message>
@@ -4536,7 +4458,7 @@ den folgenden Gasen gemischt werden:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>Wiederholen</translation>
     </message>
@@ -4771,144 +4693,144 @@ den folgenden Gasen gemischt werden:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Bilder Verzeichnisse durchsuchen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Durchsuchen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Durchsuche Bilder...(dies kann eine Weile dauern)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <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="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <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="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Laufzeittabelle anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Versuche einenTauchgang zu bearbeiten der nicht manuell angelegt wurde.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <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="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Möchtest Du Deine Änderungen in der Datendatei speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Datei speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[Cloud Speicher für] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Datendatei von älterer Version wird geöffnet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Tauchprotokolldatei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Tauchprotokolldateien (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran-Dateien (*.can *.CAN);;CSV-Dateien (*.csv *.CSV);;DiveLog.de-Dateien (*.dld *.DLD);;JDiveLog-Dateien (*.jlb *.JLB);;Liquivision-Dateien (*.lvd *.LVD);;MkVI-Dateien (*.txt *.TXT);;Suunto-Dateien (*.sde *.db *.SDE *.DB);;Divesoft-Dateien (*.dlf *.DLF);;UDDF/UDCF-Dateien (*.uddf *.udcf *.UDDF *.UDCF);;XML-Dateien (*.xml *.XML);;APD-Protokollbetrachter (*.apd *.APD);;Datatrak/WLog-Dateien (*.log *.LOG);;OSTCtools-Dateien (*.dive *.DIVE);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Kontaktiere Cloud Service...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <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="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <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="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <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="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Bitte zuerst die aktuelle Bearbeitung abschliessen um eine neue zu beginnen.</translation>
     </message>
@@ -4926,7 +4848,7 @@ Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter zeigt %1 (von %2) Tauchgängen</translation>
     </message>
@@ -6044,12 +5966,12 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>SAUERSTOFF</translation>
     </message>
@@ -6089,42 +6011,53 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6599,7 +6532,7 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Anzug:</translation>
     </message>
@@ -6626,7 +6559,7 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Stichwörter: </translation>
     </message>
@@ -6820,17 +6753,10 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
         <translation>Farbe6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Möchtest Du Deine Änderungen speichern?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>Sie sind im Begriff ein mit Subsurface verbündeltes Template zu ändern.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6914,10 +6840,105 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <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="194"/>
+        <source>#</source>
+        <translation>Nr.</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Tiefe(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temp(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Gewicht(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>US-Pfund</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Flasche</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Max. CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Ort</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7015,8 +7036,8 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
         <translation>Benutzerhandbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Das Subsurface-Handbuch kann nicht gefunden werden</translation>
     </message>
@@ -7431,7 +7452,7 @@ Durchschnitt</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Fehler beim Lesen der Kopfdaten</translation>
     </message>
@@ -7510,7 +7531,7 @@ Durchschnitt</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
@@ -7614,7 +7635,7 @@ Durchschnitt</translation>
         <translation>Kein zugehöriger Tauchcomputer für die Datei &apos;%s&apos; gefunden</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>keine</translation>
     </message>
@@ -7622,7 +7643,7 @@ Durchschnitt</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>Deko-Stopp</translation>
     </message>
@@ -7635,7 +7656,7 @@ Durchschnitt</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>Nullzeit</translation>
     </message>
@@ -7643,45 +7664,45 @@ Durchschnitt</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>Aufstieg</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>Tiefster Deko-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>Arbeit</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>Sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>Verletzung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>Markierung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>Oberfläche</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>Sicherheitsstopp</translation>
     </message>
@@ -7690,193 +7711,193 @@ Durchschnitt</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>Gaswechsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>Sicherheitsstopp (obligatorisch)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>Tiefen-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>Sicherheits-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <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="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>verbleibende Atemzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>Richtung</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>Gewebewarnung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>Nullzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <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="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Tauchgang %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Fehler beim Lesen der Temperatur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Fehler beim Auslesen des Modus des Tauchcomputers</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen des Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Unzureichende Privilegien zum Öffnen von Gerät %s %s (%s)</translation>
     </message>
@@ -8088,7 +8109,7 @@ Durchschnitt</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8097,70 +8118,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8169,7 +8190,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8178,170 +8199,170 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>In Deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>Nullzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>Gesamtaufstiegszeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>Deko (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>Nullzeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>Nullzeit: &gt; 2h (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>Gesamtaufstiegszeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>Gesamtaufstiegszeit: &gt;2h (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>Restgrundzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berechneter tiefster Deko-Stopp %.0f %s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Gewebe %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>Herzschlag: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>Peilung: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Durchschnittstiefe bis hier %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
@@ -8376,16 +8397,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 Tauchgänge)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 Tauchgang)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>Boot</translation>
@@ -8659,42 +8670,47 @@ EADD: %d%s
         <translation>mehr als %d Tage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>für Tauchgänge Nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>für die ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>für Tauchgang Nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>für den ausgewählten Tauchgang</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>für alle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(keine Tauchgänge)</translation>
     </message>
@@ -8794,7 +8810,7 @@ EADD: %d%s
         <translation>Dez</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index 7ddcaf985..322950ea2 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Person: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Sucht nach Tauchgruppenleiter und Tauchpartner</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Verwenden</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Hier klicken entfernt diese Flasche.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flasche kann nicht entfernt werden</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <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>
@@ -1898,104 +1898,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>Nr.</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Bewertung</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Tiefe(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Dauer</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temp(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Gewicht(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>US Pfund</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Anzug</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Flasche</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>AMV(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Max. CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Ort</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2015,7 +1917,7 @@
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="855"/>
         <source>Remove dive(s) from trip</source>
-        <translation>Entferne Tauchgäng(e) aus Reise</translation>
+        <translation>Tauchgäng(e) aus Reise entfernen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="856"/>
@@ -2096,12 +1998,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Neuen Tauchplatz erstellen, relevante Informationen werden aus dem aktuellen Tauchgang kopiert.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Neuen Tauchplatz mit diesem Namen erstellen</translation>
     </message>
@@ -2377,7 +2279,7 @@
     <message>
         <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
         <source>Subsurface native XML format.</source>
-        <translation>Natives Subsurface XML-Format</translation>
+        <translation>Natives Subsurface-XML-Format</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
@@ -2637,7 +2539,7 @@
         <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="686"/>
         <source>Sample setpoint</source>
-        <translation>Set-Point des Datenpunkts</translation>
+        <translation>Einstellwert des Datenpunkts</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
@@ -2787,32 +2689,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Endtiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Laufzeit</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Gasverbrauch</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC SetPoint</translation>
     </message>
@@ -2945,7 +2847,7 @@
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
         <source>Ceiling</source>
-        <translation>Tiefster Deko-Stopp</translation>
+        <translation>Auftauchgrenze</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
@@ -3021,127 +2923,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Bewertung</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Gewicht(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>AMV(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Tiefe(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3269,7 +3171,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="104"/>
         <source>Choose Bluetooth download mode</source>
-        <translation>Bluetooth-Modus wählen</translation>
+        <translation>Bluetooth-Modus auswählen</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="382"/>
@@ -3325,7 +3227,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="122"/>
         <source>Choose Bluetooth download mode</source>
-        <translation>Bluetooth-Modus wählen</translation>
+        <translation>Bluetooth-Modus auswählen</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="149"/>
@@ -3413,7 +3315,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
         <source>Download into new trip</source>
-        <translation>Download in neue Reise</translation>
+        <translation>In neue Reise herunterladen</translation>
     </message>
 </context>
 <context>
@@ -3535,7 +3437,7 @@ bitte senden Sie das Folgende an die Entwickler.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Ort:</translation>
     </message>
@@ -3661,7 +3563,7 @@ bitte senden Sie das Folgende an die Entwickler.
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Tauchplatzverwaltung</translation>
     </message>
@@ -3682,7 +3584,7 @@ bitte senden Sie das Folgende an die Entwickler.
         <translation>Es werden Tauchplätze vereinigt; diese Aktion kann nicht zurückgenommen werden. Trotzdem fortfahren?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Sie bearbeiten einen Tauchplatz</translation>
     </message>
@@ -3992,6 +3894,26 @@ bitte senden Sie das Folgende an die Entwickler.
         <translation>Gewicht hinzufügen</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation>Freitauchgang</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Lufttemp. [%1]</translation>
@@ -4029,69 +3951,69 @@ bitte senden Sie das Folgende an die Entwickler.
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Tiefster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Flachster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Höchster gesamt SAC eines Tauchganges</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Niedrigster gesamt SAC eines Tauchganges</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Durchschnittlicher gesamt SAC aller ausgewählter Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Höchste Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Niedrigste Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Durchschnittstemperatur aller ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Längster Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Kürzester Tauchgang</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Durchschnittsdauer aller ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4100,22 +4022,22 @@ den folgenden Gasen gemischt werden:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>und</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Neuer Tauchplatz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Änderungen verwerfen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation>
     </message>
@@ -4138,37 +4060,37 @@ den folgenden Gasen gemischt werden:
         <location filename="../qt-ui/mainwindow.ui" line="509"/>
         <location filename="../build/ui_mainwindow.h" line="542"/>
         <source>Toggle pHe graph</source>
-        <translation>pHe-Kurve ein-/ausschalten</translation>
+        <translation>pHe-Kurve umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="545"/>
         <location filename="../build/ui_mainwindow.h" line="545"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Berechnung aller Gewebe ein-/ausschalten</translation>
+        <translation>Berechnung aller Gewebe umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="521"/>
         <location filename="../build/ui_mainwindow.h" line="543"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Auftauchgrenze Tauchcomputer ein-/ausschalten</translation>
+        <translation>Vom Tauchcomputer berechnete Auftauchgrenze umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="533"/>
         <location filename="../build/ui_mainwindow.h" line="544"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Berechnete Auftauchgrenze ein-/ausschalten</translation>
+        <translation>Berechnete Auftauchgrenze umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="605"/>
         <location filename="../build/ui_mainwindow.h" line="550"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Nullzeit, Gesamtaufstiegszeit ein-/ausschalten</translation>
+        <translation>Nullzeit, Gesamtaufstiegszeit umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="557"/>
         <location filename="../build/ui_mainwindow.h" line="546"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Berechnete Auftauchgrenze in 3m Schritten ein-/ausschalten</translation>
+        <translation>Berechnete Auftauchgrenze in 3 m Schritten umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="462"/>
@@ -4180,31 +4102,31 @@ den folgenden Gasen gemischt werden:
         <location filename="../qt-ui/mainwindow.ui" line="569"/>
         <location filename="../build/ui_mainwindow.h" line="547"/>
         <source>Toggle heart rate</source>
-        <translation>Pulsrate ein-/ausschalten</translation>
+        <translation>Pulsrate umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="581"/>
         <location filename="../build/ui_mainwindow.h" line="548"/>
         <source>Toggle MOD</source>
-        <translation>MOD ein-/ausschalten</translation>
+        <translation>MOD umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="593"/>
         <location filename="../build/ui_mainwindow.h" line="549"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>EAD, END, EADD ein-/ausschalten</translation>
+        <translation>EAD, END, EADD umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="617"/>
         <location filename="../build/ui_mainwindow.h" line="551"/>
         <source>Toggle SAC rate</source>
-        <translation>AMV-Rate ein-/ausschalten</translation>
+        <translation>AMV-Rate umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="629"/>
         <location filename="../build/ui_mainwindow.h" line="552"/>
         <source>Toggle ruler</source>
-        <translation>Lineal ein-/ausschalten</translation>
+        <translation>Lineal umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="86"/>
@@ -4268,7 +4190,7 @@ den folgenden Gasen gemischt werden:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
@@ -4342,7 +4264,7 @@ den folgenden Gasen gemischt werden:
         <location filename="../qt-ui/mainwindow.ui" line="250"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
-        <translation>GPS-Daten vom Subsurface-Webdienst importieren</translation>
+        <translation>GPS-Daten von Subsurface-Webdienst importieren</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="258"/>
@@ -4438,7 +4360,7 @@ den folgenden Gasen gemischt werden:
         <location filename="../qt-ui/mainwindow.ui" line="418"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
-        <translation>Vollbild Umschalten</translation>
+        <translation>Vollbild umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="446"/>
@@ -4510,7 +4432,7 @@ den folgenden Gasen gemischt werden:
         <location filename="../qt-ui/mainwindow.ui" line="688"/>
         <location filename="../build/ui_mainwindow.h" line="558"/>
         <source>Toggle tissue graph</source>
-        <translation>Gewebe-Sättigungskurve ein-/ausschalten</translation>
+        <translation>Gewebe-Sättigungskurve umschalten</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="693"/>
@@ -4521,7 +4443,7 @@ den folgenden Gasen gemischt werden:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>&amp;Rückgängig</translation>
     </message>
@@ -4534,7 +4456,7 @@ den folgenden Gasen gemischt werden:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>&amp;Wiederherstellen</translation>
     </message>
@@ -4769,144 +4691,144 @@ den folgenden Gasen gemischt werden:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
-        <translation>Durchsuche Bild-Verzeichnisse</translation>
+        <translation>Bildverzeichnisse durchsuchen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Durchsuchen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Bilder werden gesucht...(dies kann eine Weile dauern)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <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="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <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="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Laufzeittabelle anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Es wird versucht, einen nicht Tauchgang, der nicht manuell erstellt wurde, zu editieren.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <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="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <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="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Datei speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[Cloudspeicher für] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Datendatei von älterer Version wird geöffnet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Tauchprotokolldatei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Tauchprotokolldateien (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran-Dateien (*.can *.CAN);;CSV-Dateien (*.csv *.CSV);;DiveLog.de-Dateien (*.dld *.DLD);;JDiveLog-Dateien (*.jlb *.JLB);;Liquivision-Dateien (*.lvd *.LVD);;MkVI-Dateien (*.txt *.TXT);;Suunto-Dateien (*.sde *.db *.SDE *.DB);;Divesoft-Dateien (*.dlf *.DLF);;UDDF/UDCF-Dateien (*.uddf *.udcf *.UDDF *.UDCF);;XML-Dateien (*.xml *.XML);;APD-Protokollbetrachter (*.apd *.APD);;Datatrak/WLog-Dateien (*.log *.LOG);;OSTCtools-Dateien (*.dive *.DIVE);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Kontaktaufnahme mit dem Cloud-Dienst...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <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="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <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="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <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="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Jahresstatistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <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>
@@ -4924,7 +4846,7 @@ Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter zeigt %1 (von %2) Tauchgängen</translation>
     </message>
@@ -5628,7 +5550,7 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <location filename="../qt-ui/preferences.ui" line="849"/>
         <location filename="../build/ui_preferences.h" line="1356"/>
         <source>Draw dive computer reported ceiling red</source>
-        <translation>Zeichne Auftauchgrenze des Tauchcomputers in rot</translation>
+        <translation>Auftauchgrenze des Tauchcomputers in rot zeichnen</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="860"/>
@@ -5965,7 +5887,7 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
     <message>
         <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
         <source>Add set-point change</source>
-        <translation>Set-Point-Wechsel hinzufügen</translation>
+        <translation>Einstellwertwechsel hinzufügen</translation>
     </message>
     <message>
         <location filename="../qt-ui/profile/profilewidget2.cpp" line="1261"/>
@@ -6042,12 +5964,12 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>SAUERSTOFF</translation>
     </message>
@@ -6087,42 +6009,53 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation>(%1 Tauchgänge)</translation>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation>(1 Tauchgang)</translation>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cft</translation>
     </message>
@@ -6206,7 +6139,7 @@ Bitte Bluetooth auf dem OSTC Sport starten und die gleichen Einstellungen wie f�
         <location filename="../qt-ui/setpoint.ui" line="43"/>
         <location filename="../build/ui_setpoint.h" line="83"/>
         <source>New set-point (0 for OC)</source>
-        <translation>Neuer Set-Point (0 für offenes System)</translation>
+        <translation>Neuer Einstellwert (0 für offenes System)</translation>
     </message>
     <message>
         <location filename="../qt-ui/setpoint.ui" line="61"/>
@@ -6379,7 +6312,7 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
     <message>
         <location filename="../build/ui_simpledivesiteedit.h" line="104"/>
         <source>Dive site quick edit. Hit ESC or click outside to close</source>
-        <translation>Tauchplatz Schnell-Editor. ESC-Taste drücken oder außerhalb klicken zum Schließen</translation>
+        <translation>Tauchplatz Schnellbearbeitung. ESC-Taste drücken oder außerhalb klicken, um zu Schließen</translation>
     </message>
 </context>
 <context>
@@ -6597,7 +6530,7 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Anzug:</translation>
     </message>
@@ -6624,7 +6557,7 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Stichwörter: </translation>
     </message>
@@ -6818,17 +6751,10 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
         <translation>Farbe6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Möchten Sie Ihre Änderungen speichern?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>Sie sind im Begriff ein mit Subsurface verbündeltes Template zu ändern.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6912,10 +6838,105 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <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="194"/>
+        <source>#</source>
+        <translation>Nr.</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Bewertung</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Tiefe(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temp(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Gewicht(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>US-Pfund</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Anzug</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Flasche</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>AMV(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Max. CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Ort</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7013,8 +7034,8 @@ Nicht alle Bilder haben Zeitstempel zwischen 30min vor und 30min nach einem der
         <translation>Benutzerhandbuch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Das Subsurface-Handbuch kann nicht gefunden werden</translation>
     </message>
@@ -7429,7 +7450,7 @@ Durchschnitt</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Fehler beim Lesen der Kopfdaten</translation>
     </message>
@@ -7508,7 +7529,7 @@ Durchschnitt</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) oder (%s)</translation>
     </message>
@@ -7612,7 +7633,7 @@ Durchschnitt</translation>
         <translation>Kein zugehöriger Tauchcomputer für die Datei &apos;%s&apos; gefunden</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>keine</translation>
     </message>
@@ -7620,7 +7641,7 @@ Durchschnitt</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>Deko-Stopp</translation>
     </message>
@@ -7633,7 +7654,7 @@ Durchschnitt</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>Nullzeit</translation>
     </message>
@@ -7641,45 +7662,45 @@ Durchschnitt</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>Aufstieg</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
-        <translation>Tiefster Deko-Stopp</translation>
+        <translation>Auftauchgrenze</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>Arbeit</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>Sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>Verletzung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>Markierung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>Oberfläche</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>Sicherheitsstopp</translation>
     </message>
@@ -7688,193 +7709,193 @@ Durchschnitt</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>Gaswechsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>Sicherheitsstopp (freiwillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>Sicherheitsstopp (obligatorisch)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>Tiefen-Stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
-        <translation>Sicherheits-Stopp</translation>
+        <translation>Auftauchgrenze (Sicherheitsstopp)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>Tauchgangsdauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <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="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>verbleibende Atemzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>Richtung</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>Gewebewarnung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>Nullzeit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>ungültige Ereignisnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <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="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Fehler beim Registrieren der Daten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Fehler beim Lesen des Datums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Tauchgang %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Fehler beim Lesen der Dauer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fehler beim Lesen der maximalen Tiefe</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Fehler beim Lesen der Temperatur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fehler beim Lesen der Gasgemischszahl</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Fehler beim Lesen des Salzgehalts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kein Oberflächendruck erhalten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Fehler beim Auslesen des Modus des Tauchcomputers</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Fehler beim Lesen des Gasgemischs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Fehler beim Lesen der Samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Ereignis: warte auf Benutzeraktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Fehler beim Registrieren der Ereignisbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Fehler beim Importieren der Tauchgangsdaten</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fehler beim Öffnen von %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Unzureichende Privilegien zum Öffnen von Gerät %s %s (%s)</translation>
     </message>
@@ -8086,7 +8107,7 @@ Durchschnitt</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8095,70 +8116,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>AMV: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8167,7 +8188,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8176,170 +8197,170 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: unbek. Zeit @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>In Deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>Nullzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>Gesamtaufstiegszeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>Deko (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>Nullzeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>Nullzeit: &gt; 2h (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>Gesamtaufstiegszeit: %umin (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>Gesamtaufstiegszeit: &gt; 2h (berechnet)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>Restgrundzeit: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
-        <translation>Berechneter tiefster Deko-Stopp %.0f %s
+        <translation>Berechnete Auftauchgrenze %.0f %s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Gewebe %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>Herzschlag: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>Peilung: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Durchschnittstiefe bis hier %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
@@ -8374,16 +8395,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 Tauchgänge)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 Tauchgang)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>Boot</translation>
@@ -8657,42 +8668,47 @@ EADD: %d%s
         <translation>mehr als %d Tage</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation>%dmin %dsek</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>für Tauchgänge Nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>für die ausgewählten Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>für Tauchgang Nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>für den ausgewählten Tauchgang</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>für alle Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(keine Tauchgänge)</translation>
     </message>
@@ -8792,7 +8808,7 @@ EADD: %d%s
         <translation>Dez</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
@@ -9083,7 +9099,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation>
     <message>
         <location filename="../save-html.c" line="471"/>
         <source>Trips</source>
-        <translation>Ausflüge</translation>
+        <translation>Reisen</translation>
     </message>
     <message>
         <location filename="../save-html.c" line="473"/>
diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts
index 5f7520771..a8bcda9d4 100644
--- a/translations/subsurface_el_GR.ts
+++ b/translations/subsurface_el_GR.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -1714,17 +1714,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Πατώντας εδώ θα διαγραφή αυτή η φιάλη.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Η φιάλη δεν μπορεί να διαγραφεί</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1897,104 +1897,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Ημερομηνία</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Βαθμός</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Διάρκεια</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Στολή</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Τοποθεσία</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2095,12 +1997,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation type="unfinished"/>
     </message>
@@ -2786,32 +2688,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>άγνωστο</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3016,127 +2918,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Βαθμός</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Βάθος</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Θερμοκρασία</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Βάρος</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Στολή</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Τοποθεσία</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Διάρκεια</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3527,7 +3429,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3653,7 +3555,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation type="unfinished"/>
     </message>
@@ -3674,7 +3576,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -3984,6 +3886,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
@@ -4021,91 +3943,91 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -4258,7 +4180,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Άνοιγμα</translation>
     </message>
@@ -4511,7 +4433,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
@@ -4524,7 +4446,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
@@ -4759,143 +4681,143 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν κλέισετε το αρχείο.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν προσπαθήσετε να προσθέσετε μια κατάδυση.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Προειδοποίηση</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν ανοίξετε ένα νέο αρχείο.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -4913,7 +4835,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -6029,12 +5951,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>ΑΕΡΑΣ</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
@@ -6074,42 +5996,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6577,7 +6510,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -6604,7 +6537,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -6798,16 +6731,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6891,10 +6818,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Ημερομηνία</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Βαθμός</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Στολή</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Τοποθεσία</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -6992,8 +7014,8 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Δεν βρέθηκε το εγχειρίδιο χρήσης</translation>
     </message>
@@ -7404,7 +7426,7 @@ SAC (%1)</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7483,7 +7505,7 @@ SAC (%1)</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ή (%s)</translation>
     </message>
@@ -7587,7 +7609,7 @@ SAC (%1)</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>κανένα</translation>
     </message>
@@ -7595,7 +7617,7 @@ SAC (%1)</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>στάση αποσυμπίεσης</translation>
     </message>
@@ -7608,7 +7630,7 @@ SAC (%1)</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7616,45 +7638,45 @@ SAC (%1)</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>άνοδος</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>ταβάνι</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>φόρτο εργασίας</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>πομπός</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>παράβαση</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>σελιδοδείκτης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>επιφάνεια</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>στάση ασφαλείας</translation>
     </message>
@@ -7663,193 +7685,193 @@ SAC (%1)</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>αλλαγή αερίου</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>στάση ασφαλείας (προληπτική)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>στάση ασφαλείας (υποχρεωτική)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>βαθιά στάση</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>ταβάνι (στάση ασφαλείας)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>διάρκεια</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>below floor</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>μέγιστο βάθος</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>airtime</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>heading</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>προειδοποίηση επιπέδου ιστών</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>non stop time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>άκυρος αριθμός συμβάντος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Αδύνατον να αναλυθεί το %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Σφάλμα στην ημερομηνία</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Κατάδυση %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Σφάλμα στην διάρκεια της κατάδυσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Σφάλμα στο μέγιστο βάθος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Σφάλμα στον αριθμό των αερίων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Σφάλμα στην απόκτηση της αλμυρότητας</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Σφάλμα στην απόκτηση της ατμοσφαιρικής πίεσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Σφάλμα στο μίγμα αερίων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Σφάλμα στα δείγματα</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Σφάλμα στην καταχώρηση του συμβάντος</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Σφάλμα στην εισαγωγή δεδομένων</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -8060,226 +8082,226 @@ SAC (%1)</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8314,16 +8336,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 dives)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 dive)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>σκάφος</translation>
@@ -8597,42 +8609,47 @@ EADD: %d%s
         <translation>περισσότερο από %d ημέρες</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>για καταδύσεις #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>για επιλεγμένες καταδύσεις</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>για κατάδυση #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>για επιλεγμένη κατάδυση</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>για όλες τις καταδύσεις</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(καμία κατάδυση)</translation>
     </message>
@@ -8732,7 +8749,7 @@ EADD: %d%s
         <translation>Δεκ</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts
index 32ebd9874..e55aa79d4 100644
--- a/translations/subsurface_en_GB.ts
+++ b/translations/subsurface_en_GB.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Person: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Searches for buddies and divemasters</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Use</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Clicking here will remove this cylinder.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Cylinder cannot be removed</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>This gas is in use. Only cylinders that are not used in the dive can be removed.</translation>
     </message>
@@ -1899,104 +1899,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>No.</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Rating</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Depth(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Duration</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temp(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Weight(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Suit</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Cyl</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Max CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Location</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Create a new dive site, copying relevant information from the current dive.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Create a new dive site with this name</translation>
     </message>
@@ -2788,32 +2690,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Final depth</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Used gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>No.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Weight</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Weight(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Suit</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Location</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Depth(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3536,7 +3438,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Location: </translation>
     </message>
@@ -3662,7 +3564,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Dive site management</translation>
     </message>
@@ -3684,7 +3586,7 @@ p, li { white-space: pre-wrap; }
  Are you sure you want to continue?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>You are editing a dive site</translation>
     </message>
@@ -3994,6 +3896,26 @@ p, li { white-space: pre-wrap; }
         <translation>Add weight system</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Air temp. [%1]</translation>
@@ -4031,69 +3953,69 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Deepest dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Shallowest dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Highest total SAC of a dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Lowest total SAC of a dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Average total SAC of all selected dives</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Highest temperature</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Lowest temperature</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Average temperature of all selected dives</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Longest dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Shortest dive</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Average length of all selected dives</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4102,22 +4024,22 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation> and </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>New dive site</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Discard the changes?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>You are about to discard your changes.</translation>
     </message>
@@ -4270,7 +4192,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
@@ -4523,7 +4445,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>&amp;Undo</translation>
     </message>
@@ -4536,7 +4458,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>&amp;Redo</translation>
     </message>
@@ -4771,144 +4693,144 @@ mixed from Air and using:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Open file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Traverse image directories</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Scan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Scanning images...(this can take a while)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Please save or cancel the current dive edit before closing the file.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Please save or cancel the current dive edit before trying to add a dive.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Print runtime table</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Trying to edit a dive that&apos;s not a manually added dive.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Do you want to save the changes that you made in the file %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Do you want to save the changes that you made in the data file?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Save changes?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Save file as</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[cloud storage for] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Opening datafile from older version</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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>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.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Open dive log file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Contacting cloud service...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Changes will be lost if you don&apos;t save them.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Warning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Please save or cancel the current dive edit before opening a new file.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Trying to replan a dive that&apos;s not a planned dive.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Yearly statistics</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Please, first finish the current edition before trying to do another.</translation>
     </message>
@@ -4926,7 +4848,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter shows %1 (of %2) dives</translation>
     </message>
@@ -6044,12 +5966,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>OXYGEN</translation>
     </message>
@@ -6089,42 +6011,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6600,7 +6533,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Suits: </translation>
     </message>
@@ -6627,7 +6560,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Tags: </translation>
     </message>
@@ -6821,17 +6754,10 @@ Not all images have timestamps in the range between
         <translation>colour6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Do you want to save your changes?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>You are about to modify a template bundled with Subsurface.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6915,10 +6841,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation>(%1 shown)</translation>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>No.</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Depth(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Duration</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temp(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Weight(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Suit</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Cyl</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Max CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Location</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7016,8 +7037,8 @@ Not all images have timestamps in the range between
         <translation>User manual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Cannot find the Subsurface manual</translation>
     </message>
@@ -7432,7 +7453,7 @@ Maximum</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Error parsing the header</translation>
     </message>
@@ -7511,7 +7532,7 @@ Maximum</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) or (%s)</translation>
     </message>
@@ -7615,7 +7636,7 @@ Maximum</translation>
         <translation>No matching DC found for file &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>none</translation>
     </message>
@@ -7623,7 +7644,7 @@ Maximum</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>deco stop</translation>
     </message>
@@ -7636,7 +7657,7 @@ Maximum</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7644,45 +7665,45 @@ Maximum</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>ascent</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>ceiling</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>workload</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>transmitter</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>violation</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>bookmark</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>surface</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>safety stop</translation>
     </message>
@@ -7691,193 +7712,193 @@ Maximum</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>gas change</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>safety stop (recommended)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>safety stop (mandatory)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>deep stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (safety stop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>divetime</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>below floor</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>maxdepth</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>airtime</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>heading</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>tissue level warning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>no-stop time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>invalid event number</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Unable to create parser for %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Error registering data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Error parsing the date/time</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Dive %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Error parsing the divetime</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Error parsing the maxdepth</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Error parsing temperature</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Error parsing the gas mix count</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Error obtaining water salinity</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Error obtaining surface pressure</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Error obtaining divemode</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Error parsing the gas mix</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Error parsing the samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Event: waiting for user action</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Error registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Dive data import error</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Unable to open %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Insufficient privileges to open the device %s %s (%s)</translation>
     </message>
@@ -8089,7 +8110,7 @@ Maximum</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8098,70 +8119,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8170,7 +8191,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8179,170 +8200,170 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Safety Stop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Safety Stop: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: unkn time @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Calculated ceiling %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tissue %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>heartbeat: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>bearing: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>mean depth to here %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8377,16 +8398,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 dives)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 dive)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>boat</translation>
@@ -8660,42 +8671,47 @@ EADD: %d%s
         <translation>more than %d days</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>for dive No.s</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>for selected dives</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>for dive No. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>for selected dive</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>for all dives</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(no dives)</translation>
     </message>
@@ -8795,7 +8811,7 @@ EADD: %d%s
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts
index 4520c607a..fa9bfe75d 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Persona:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Busca por compañeros y divemasters</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Uso</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Pulsar aquí borrará esta botella</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>La botella no puede borrarse</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>
 Este gas se está usando. Solo se pueden borrar botellas que no se usen en la inmersión.</translation>
@@ -1900,104 +1900,6 @@ el ordenador de buceo seleccionado?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>N.º</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Valoración</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Prof.(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Duración</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temp(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Lastre(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Traje</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Botella</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>CAS(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>CNS máximo</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Ubicación</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2098,12 +2000,12 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Crea un nuevo punto de buceo, tomando información relevante de la inmersión actual.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Crea un nuevo punto de buceo con este nombre</translation>
     </message>
@@ -2789,32 +2691,32 @@ el ordenador de buceo seleccionado?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Profundidad final</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Tiempo acumulado</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Gas usado</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3023,127 +2925,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>N.º</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Valoración</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Prof.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Lastre(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Traje</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Botella</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>CAS(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>CNS máximo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Prof.(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3537,7 +3439,7 @@ por favor envía lo siguiente al equipo de desarrollo.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Ubicación: </translation>
     </message>
@@ -3663,7 +3565,7 @@ por favor envía lo siguiente al equipo de desarrollo.
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Gestión de puntos de buceo</translation>
     </message>
@@ -3685,7 +3587,7 @@ por favor envía lo siguiente al equipo de desarrollo.
 ¿Seguro que deseas continuar?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Estas editando un punto de buceo</translation>
     </message>
@@ -3995,6 +3897,26 @@ por favor envía lo siguiente al equipo de desarrollo.
         <translation>Añadir sistema de lastre</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. aire [%1]</translation>
@@ -4032,69 +3954,69 @@ por favor envía lo siguiente al equipo de desarrollo.
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Inmersión más profunda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Inmersión más superficial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Mayor CAS total de una inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Menor CAS total de una inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>CAS total promedio de todas las inmersiones seleccionadas </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Temperatura más alta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Temperatura más baja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Temperatura promedia de todas las inmersiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Inmersión más larga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Inmersión más corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Duración promedia de todas las inmersiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4103,22 +4025,22 @@ a partir de aire y usando:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Nuevo punto de buceo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>¿ Descartar los cambios ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Estás a punto de descartar tus cambios.</translation>
     </message>
@@ -4271,7 +4193,7 @@ a partir de aire y usando:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
@@ -4524,7 +4446,7 @@ a partir de aire y usando:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>Deshacer</translation>
     </message>
@@ -4537,7 +4459,7 @@ a partir de aire y usando:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>&amp;Rehacer</translation>
     </message>
@@ -4772,144 +4694,144 @@ a partir de aire y usando:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Abrir archivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Buscar en directorios de imágenes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Escanear</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Buscando imágenes ... (esto puede llevar un tiempo)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de cerrar el archivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de intentar añadir otra.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Imprimir tabla de tiempo acumulado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Intentando editar una inmersión que no se ha añadido manualmente.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>¿Quieres guardar los cambios realizados en el archivo %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>¿Quieres guardar los cambios que has hecho en el archivo de datos?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>¿Guardar cambios?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Guardar archivo como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[almacenamiento en la nube de] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Abriendo archivo de datos de una versión anterior</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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>Has abierto un archivo de datos de una versión anterior de Subsurface. Te recomendaamos leer el manual para informarte acerca de los cambios de la nueva versión, especialmente sobre la gestión de puntos de buceo que ha variado significativamente.
 Subsurface ya ha intentado cargar los datos pero puede que merezca la pena perder un momento en echar una mirada al nuevo sistema de gestión de puntos de buceo para asegurarte de que todo este correcto.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Abrir archivo de registro de inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Archivos de registro (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Archivos de Cochran (*.can *.CAN);;Archivos CSV (*.csv *.CSV);;Archivos de DiveLog.de (*.dld *.DLD);;Archivos de JDiveLog  (*.jlb *.JLB);;Archivos de Liquivision  (*.lvd *.LVD);;Archivos de MkVI (*.txt *.TXT);;Archivos de Suunto (*.sde *.db *.SDE *.DB);;Archivos de Divesoft (*.dlf *.DLF);;Archivos UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Archivos XML (*.xml *.XML);;Archivos de APD log viewer (*.apd *.APD);;Archivos de Datatrak/WLog (*.log *.LOG);;Archivos de OSTCtools (*.dive *.DIVE);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Contactando con el servicio en la nube ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Se perderán los cambios si no los guarda.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Advertencia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de abrir otro archivo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Se está intentando re-planificar un buceo que no ha sido planificado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Estadísticas anuales</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Por favor, termina la edición actual antes de intentar hacer otra.</translation>
     </message>
@@ -4927,7 +4849,7 @@ Subsurface ya ha intentado cargar los datos pero puede que merezca la pena perde
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Los filtros muestran %1 (de %2) inmersiones</translation>
     </message>
@@ -6045,12 +5967,12 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>AIRE</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>OXÍGENO</translation>
     </message>
@@ -6090,42 +6012,53 @@ Por favor, inicia Bluetooth en tu OSTC Sport y efectúa los mismos preparativos
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation>(%1 inmersiones)</translation>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation>(1 inmersión)</translation>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6602,7 +6535,7 @@ cualquiera de las inmersiones seleccionadas.</translation>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Trajes:</translation>
     </message>
@@ -6629,7 +6562,7 @@ cualquiera de las inmersiones seleccionadas.</translation>
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Etiquetas:</translation>
     </message>
@@ -6823,17 +6756,10 @@ cualquiera de las inmersiones seleccionadas.</translation>
         <translation>Color6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>¿ Quieres guardar tus cambios ?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>Estás a punto de modificar una plantilla distribuida con Subsurface.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6917,10 +6843,105 @@ cualquiera de las inmersiones seleccionadas.</translation>
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation>(%1 mostrada)</translation>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>N.º</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Valoración</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Prof.(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Duración</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temp(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Lastre(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Traje</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Botella</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>CAS(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>CNS máximo</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Ubicación</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7018,8 +7039,8 @@ cualquiera de las inmersiones seleccionadas.</translation>
         <translation>Manual de usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>No puedo encontrar el manual de Subsurface</translation>
     </message>
@@ -7434,7 +7455,7 @@ Media</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Error al analizar la cabecera</translation>
     </message>
@@ -7513,7 +7534,7 @@ Media</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) o (%s)</translation>
     </message>
@@ -7617,7 +7638,7 @@ Media</translation>
         <translation>No se ha encontrado concordancia con ningún DC para el archivo &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>ninguno</translation>
     </message>
@@ -7625,7 +7646,7 @@ Media</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>parada deco</translation>
     </message>
@@ -7638,7 +7659,7 @@ Media</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7646,45 +7667,45 @@ Media</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>ascenso</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>techo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>esfuerzo</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>transmisor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>violación</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>marcador</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>parada de seguridad</translation>
     </message>
@@ -7693,193 +7714,193 @@ Media</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>cambio de mezcla</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>parada de seguridad (voluntaria)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>parada de seguridad (obligatoria)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>parada profunda</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>techo (parada de seguridad)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>duración de inmersión</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>por debajo del techo</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>Profundidad Max</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>tiempo de aire</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>encabezado</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>Alarma de nivel de tejidos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>tiempo sin parada</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>el número de evento no es válido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>No es posible crear el analizador para %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Error al registrar los datos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Error al analizar la fecha</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Inmersión n.º %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Error al analizar el tiempo de buceo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Error al analizar la máxima profundidad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Error al leer la temperatura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Error al analizar el conteo de mezcla de gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Error al obtener salinidad del agua</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Error al obtener la presión en superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Error al obtener el modo de buceo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Error al analizar la mezcla de gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Error al analizar las muestras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: esperando acción del usuario</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modelo=%u (0x%08x), firmware=%u (0x%08x), n.º de serie=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Error al registrar el manejador de eventos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error al registrar el manejador de cancelación</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Error al importar datos de inmersiones</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>No es posible crear el contexto de libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>No se pudo abrir  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Privilegios insuficientes para abrir el dispositivo %s %s (%s)</translation>
     </message>
@@ -8091,7 +8112,7 @@ Media</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8100,70 +8121,70 @@ Prof: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>Pres: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>CAS: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>PMO: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8172,7 +8193,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8181,170 +8202,170 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Parada de seguridad: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Parada de seguridad: tiempo desc @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Parada deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Parada deco: tiempo desc @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>En deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Parada deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>En deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>LND: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Techo calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tejido %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>Ritmo cardiaco: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>Soporte: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Prof. media hasta aquí %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sProf:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sProf:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sPres:%d %s</translation>
     </message>
@@ -8379,16 +8400,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 inmersiones)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 inmersión)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>barco</translation>
@@ -8662,42 +8673,47 @@ EADD: %d%s
         <translation>más de %d días</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd, %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation>%dmin %dsegs</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>para las inmersiones n.º</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>para las inmersiones seleccionadas</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>para la inmersión n.º %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>para la inmersión seleccionada</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>Todas las inmersiones</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(ninguna inmersión)</translation>
     </message>
@@ -8797,7 +8813,7 @@ EADD: %d%s
         <translation>Dic</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index 9c40414d6..8184ec712 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Isik:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Otsi semusid ja divemastereid</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Kasuta</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Siin klikkamine eemaldab selle ballooni</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Ballooni ei saa eemaldada</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>See gaas on kasutusel. Eemaldada saab ainult neid balloone, mis pole sellel sukeldumisel kasutusel.</translation>
     </message>
@@ -1899,104 +1899,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Kuupäev</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Hinne</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Sügavus(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>jalg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Kestus</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temp(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Raskus(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>nael</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Ülikond</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Ball</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gaas</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Max CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Asukoht</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation type="unfinished"/>
     </message>
@@ -2788,32 +2690,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Lõppsügavus</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Töö aeg</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Kasutatud gaas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3018,127 +2920,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Hinne</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Raskus</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Raskus(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Ülikond</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Ball</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gaas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Sügavus(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
@@ -3531,7 +3433,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Asukoht:</translation>
     </message>
@@ -3657,7 +3559,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Sukeldumiskohtade haldamine</translation>
     </message>
@@ -3678,7 +3580,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -3988,6 +3890,26 @@ p, li { white-space: pre-wrap; }
         <translation>Lisa raskuste süsteem</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Õhu temp. [%1]</translation>
@@ -4025,69 +3947,69 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Sügavaim sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Madalaim sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Suurim summaarne SAC sukeldumisel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Madalaim summaarne SAC sukeldumisel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Keskmine summaarne SAC kõigil valitud sukeldumistel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Kõrgeim temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Madalaim temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Kõigi valitud sukeldumiste keskmine temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Pikim sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Lühim sukeldumine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Kõigi valitud sukeldumiste keskmine pikkus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4095,22 +4017,22 @@ mixed from Air and using:
 õhust ja kasutades:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Loobu muudatustest?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Oled muudatustest loobumas.</translation>
     </message>
@@ -4263,7 +4185,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Ava</translation>
     </message>
@@ -4516,7 +4438,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
@@ -4529,7 +4451,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
@@ -4764,143 +4686,143 @@ mixed from Air and using:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Ava fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Loobu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Skaneeri</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Enne faili sulgemist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Enne sukeldumise lisamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Väljasta jooksva aja tabel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Kas soovid salvestada muudatused mis tegid faili %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Kas soovid salvestada muudatused mis tegid andmefaili?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Salvesta muudatused?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Salvesta nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Ava sukeldumislogi fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Muudatusi lähevad kaotsi kui neid ei salvestata.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Enne uue faili avamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Aastane statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation>
     </message>
@@ -4918,7 +4840,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -6035,12 +5957,12 @@ väärtused</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>ÕHK</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>HAPNIK</translation>
     </message>
@@ -6080,42 +6002,53 @@ väärtused</translation>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>kuupjalg</translation>
     </message>
@@ -6589,7 +6522,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Ülikond:</translation>
     </message>
@@ -6616,7 +6549,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Märgendid:</translation>
     </message>
@@ -6810,16 +6743,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6903,10 +6830,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Kuupäev</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Hinne</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Sügavus(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>jalg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Kestus</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temp(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Raskus(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>nael</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Ülikond</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Ball</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gaas</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Max CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Asukoht</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7004,8 +7026,8 @@ Not all images have timestamps in the range between
         <translation>Kasutusjuhend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Ei leia Subsurface juhendit</translation>
     </message>
@@ -7420,7 +7442,7 @@ Max</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7499,7 +7521,7 @@ Max</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) või (%s)</translation>
     </message>
@@ -7603,7 +7625,7 @@ Max</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>mitte ükski</translation>
     </message>
@@ -7611,7 +7633,7 @@ Max</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>dekopeatus</translation>
     </message>
@@ -7624,7 +7646,7 @@ Max</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7632,45 +7654,45 @@ Max</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>tõus</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>lagi</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>töökoormus</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>saatja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>rikkumine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>järjehoidja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>pind</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>ohutuspeatus</translation>
     </message>
@@ -7679,193 +7701,193 @@ Max</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>gaasivahetus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>ohutuspeatus (vabatahtlik)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>ohutuspeatus (kohustuslik)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>sügavpeatus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>lagi (ohutuspeatus)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>põhjaaeg</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>allpool taset</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>max sügavus</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>Hapnikulimiidi osa (OLF)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>aeg õhuga</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>suund</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>koe taseme hoiatus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>mittepeatuste aeg</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>vale sündmuse nr</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Ei saa luua parserit %s %s jaoks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Viga andmete registreerimisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Viga kuupäeva ja aja tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Sukeldumine %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Viga põhjaaja tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Viga max sügavuse tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Viga gaasisegude arvu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Viga vee soolsuse saamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Viga pinnarõhu saamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Viga gaasisegu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Viga proovide tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Sündmus: ootan kasutaja sekkumist</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>mudel=%u (0x%08x), püsivara=%u (0x%08x), seerianr=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Viga sündmuste draiveri registreerimisel.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Viga tühistamise draiveri registreerimisel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Viga sukeldumise andmete impordil</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ei saa luua libdivecomputer konteksti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Ei saa avada %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -8076,7 +8098,7 @@ Max</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8085,70 +8107,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8157,7 +8179,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8166,161 +8188,161 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Ohutuspeatus: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Ohutuspeatus: teadmata aeg @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: teadmata aeg @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>Dekos
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>Dekos (arvutatud)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (arvutatud)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Arvutatud lagi %.0f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Kude %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>Pulss: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>Kurss: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8355,16 +8377,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 sukeldumist)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 sukeldumine)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>paat</translation>
@@ -8638,42 +8650,47 @@ EADD: %d%s
         <translation>enam kui %d päeva</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>sukeldumiste nr</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>valitud sukeldumiste</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>sukeldumise nr %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>valitud sukeldumise</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>kõikide sukeldumiste</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(pole sukeldumisi)</translation>
     </message>
@@ -8773,7 +8790,7 @@ EADD: %d%s
         <translation>Dets</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index 6466492c1..80ae906dd 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Henkilö:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Etsii sukelluskavereita ja divemastereita</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Käyttö</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Poista säiliö.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Säiliötä ei voida poistaa</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation>
     </message>
@@ -1899,104 +1899,6 @@ poistaa valitun sukellustietokoneen?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Ajankohta</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Yleisarvio</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Syvyys(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Kesto</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Lämpötila(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Massa(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>pauna</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Puku</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Säiliöt</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Kaasu</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>Pintakulutus(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>Happikertymä (OTU)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Max CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Kohde</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Luo uusi sukelluskohde ja kopioi oleelliset tiedot valitusta sukelluskohteesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Luo uusi sukelluskohde tälle nimelle</translation>
     </message>
@@ -2788,32 +2690,32 @@ poistaa valitun sukellustietokoneen?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Lopullinen syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Käytetty kaasuseos</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC -asetuspiste</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Yleisarvio</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Painot</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Massa(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Puku</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Kaasu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>Pintakulutus(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Syvyys(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Lämpötila(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3536,7 +3438,7 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Sijainti:</translation>
     </message>
@@ -3662,7 +3564,7 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Sukelluskohteiden hallinta</translation>
     </message>
@@ -3683,7 +3585,7 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
         <translation>Olet yhdistämässä sukelluskohteita. Toimintoa ei voi perua. Oletko varma, että haluat jatkaa?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Muokkaat sukelluskohdetta</translation>
     </message>
@@ -3993,6 +3895,26 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
         <translation>Lisää painojärjestelmä</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>Vapaakierto</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Ilman lämpötila [%1]</translation>
@@ -4030,69 +3952,69 @@ ole hyvä ja lähetä seuraava tieto kehittäjille.
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Syvin sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Matalin sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Korkein pintakulutus sukelluksella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Matalin pintakulutus sukelluksella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Keskimääräinen pintakulutus valituilla sukelluksilla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Korkein lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Matalin lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Valittujen sukellusten keskilämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Pisin sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Lyhin sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Valittujen sukellusten keskimääräinen kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4101,22 +4023,22 @@ sekoittaa ilmasta ja käyttäen:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>ja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Uusi sukelluskohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Hylätäänkö muutokset?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Olet hylkäämässä muutoksesi.</translation>
     </message>
@@ -4269,7 +4191,7 @@ sekoittaa ilmasta ja käyttäen:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Avaa</translation>
     </message>
@@ -4522,7 +4444,7 @@ sekoittaa ilmasta ja käyttäen:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>Peruuta</translation>
     </message>
@@ -4535,7 +4457,7 @@ sekoittaa ilmasta ja käyttäen:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>Tee uudelleen</translation>
     </message>
@@ -4770,144 +4692,144 @@ sekoittaa ilmasta ja käyttäen:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Avaa tiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Hae kuvia alihakemistoista</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Etsi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Kuvien etsintä käynnissä...(tämä voi kestää kauan)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen lokitiedoston sulkemista.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen sukelluksen lisäystä.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Tulosta sukellussuunnitelma</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Yrität muokata sukellusta, joka ei ole syötetty käsin.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Haluatko tallentaa muutoksesi tiedostoon %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Haluatko tallentaa muutoksesi tiedostoon?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Tallenna muutokset?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Tallenna nimellä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[pilvitallennus] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Avataan vanhan tiedostomuodon loki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Avasit vanhan tiedostomuodon lokitiedoston. Suosittelemme, että luet uuden version muutoksista käyttöohjeesta, etenkin sukelluskohteiden hallinnasta, sillä se on muuttunut huomattavasti.
 Subsurface on jo yrittänyt esi-täyttää sijaintitiedot, mutta kannattaa vielä tarkistaa uudesta sukelluskohteiden hallinnasta, että kaikki tiedot ovat oikein.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Avaa sukellusloki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Sukellusklokitiedostot (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran -tiedostot (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de -tiedostot (*.dld *.DLD);;JDiveLog -tiedostot (*.jlb *.JLB);;Liquivision -tiedostot (*.lvd *.LVD);;MkVI -tiedostot (*.txt *.TXT);;Suunto -tiedostot (*.sde *.db *.SDE *.DB);;Divesoft -tiedostot (*.dlf *.DLF);;UDDF/UDCF -tiedostot (*.uddf *.udcf *.UDDF *.UDCF);;XML -tiedostot (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog -tiedostot (*.log *.LOG);;OSTCtools -tiedostot (*.dive *.DIVE);;Kaikki tiedostot (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Otetaan yhteyttä pilvipalveluun...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Muutokset hylätään, jos et tallenna niitä.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Varoitus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Yritetään muokata sukellusta, joka ei ole sukellussuunnitelma.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Vuositilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation>
     </message>
@@ -4925,7 +4847,7 @@ Subsurface on jo yrittänyt esi-täyttää sijaintitiedot, mutta kannattaa viel�
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Suodin näyttää %1 (%2:sta) sukelluksesta</translation>
     </message>
@@ -6044,12 +5966,12 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>Ilma</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>HAPPI</translation>
     </message>
@@ -6089,42 +6011,53 @@ Ennen kuin päivitystä voidaan jatkaa, sinun tulee käynnistää Bluetooth OSTC
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
@@ -6599,7 +6532,7 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Puvut:</translation>
     </message>
@@ -6626,7 +6559,7 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Avainsanat:</translation>
     </message>
@@ -6820,17 +6753,10 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu
         <translation>väri6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Haluatko tallentaa muutokset?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>Olet muokkaamassa Subsurfacen mukana toimitettua sapluunaa.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6914,10 +6840,105 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation> (näytetään %1)</translation>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Ajankohta</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Yleisarvio</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Syvyys(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Kesto</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Lämpötila(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Massa(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>pauna</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Puku</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Säiliöt</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Kaasu</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>Pintakulutus(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>Happikertymä (OTU)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Max CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Kohde</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7015,8 +7036,8 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu
         <translation>Käyttöohje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Subsurfacen käyttöohje ei löydy</translation>
     </message>
@@ -7431,7 +7452,7 @@ Keski</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Virhe otsaketietojen tulkinnassa</translation>
     </message>
@@ -7510,7 +7531,7 @@ Keski</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) tai (%s)</translation>
     </message>
@@ -7614,7 +7635,7 @@ Keski</translation>
         <translation>Vastaavaa sukellustietokonetta tiedostolle &apos;%s&apos; ei löytynyt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>ei mitään</translation>
     </message>
@@ -7622,7 +7643,7 @@ Keski</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>deko-pysähdys</translation>
     </message>
@@ -7635,7 +7656,7 @@ Keski</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>pohja-aika</translation>
     </message>
@@ -7643,45 +7664,45 @@ Keski</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>nousu</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>katto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>työmäärä</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>lähetin</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>rike</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>kirjanmerkki</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>pinta</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>turvapysähdys</translation>
     </message>
@@ -7690,193 +7711,193 @@ Keski</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>Kaasun vaihto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>turvapysähdys (vapaaehtoinen)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>turvapysähdys (pakollinen)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>syväpysähdys</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>katto (turvapysähdys)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>sukellusaika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>liian syvällä</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>Suurin syvyys</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>Happikertymä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>Ilma-aika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>suunta</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>kudoskertymän varoitus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>keskeytyksetön aika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>tuntematon tapahtumanumero</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Jäsentäjän luominen %s %s epäonnistui</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Virhe tiedon rekisteröinnissä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Virhe ajan jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Sukellus %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Virhe sukelluksen keston jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Virhe maksimisyvyyden jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Virhe lämpötilan jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Virhe kaasuseosten määrän jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Virhe veden suolapitoisuuden määrityksessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Virhe ilmanpaineen määrityksessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Virhe sukellustyypin lataamisessa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Virhe kaasuseoksen jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Virhe näytteiden tulkinnassa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Tapahtuma: odotetaan käyttäjän toimia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Virhe sukellusten jäsentämisessä</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>libdivecomputer-kontekstin luominen epäonnistui</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Avaaminen epäonnistui: %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Käyttövaltuudet eivät riitä laitteen %s %s (%s) avaamiseen</translation>
     </message>
@@ -8090,7 +8111,7 @@ Keski</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8099,70 +8120,70 @@ S: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>L: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>N: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8171,7 +8192,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8180,169 +8201,169 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Turvapysähdys: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Turvapysähdys: ajankohta? @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: ajankohta? @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>Dekossa</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>Dekossa (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (lask.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Laskettu katto %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Kudos %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>syke: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>suunta: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Keskisyvyys tähän asti %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sA: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sS:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sS:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sN:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sN:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8377,16 +8398,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1kuu %2 (%3 sukellusta)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1kuu %2 (1 sukellus)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>vene</translation>
@@ -8660,42 +8671,47 @@ EADD: %d%s
         <translation>yli %d päivää</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%d pv %d t %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%d t %d min</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>sukellukselle numero </translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>valitut sukellukset</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>Sukellus #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>valittu sukellus</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>kaikille sukelluksille</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(ei sukelluksia)</translation>
     </message>
@@ -8795,7 +8811,7 @@ EADD: %d%s
         <translation>joulu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index 33350c0ce..4867042c6 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Personne : </translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Recherches d&apos;équipiers et de moniteurs</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Utilise</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Cliquer ici retirera ce bloc.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Le bloc ne peut pas être retiré.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Ce gaz est utilisé. Seuls les blocs qui ne sont pas utilisés dans la plongée peuvent être retirés.</translation>
     </message>
@@ -1899,104 +1899,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>N°</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Date</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Évaluation</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Profondeur(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>pied</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Durée</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Température(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Poids(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>livre US</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Combinaison</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Bloc</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gaz</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>Consommation d&apos;air(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>SNC max</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Lieu</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Créer un nouveau site de plongée, en copiant les informations pertinentes à partir de la plongée actuelle.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Créer un nouveau site de plongée avec ce nom</translation>
     </message>
@@ -2788,32 +2690,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Prof. finale</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Durée de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Gaz utilisé</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>Setpoint CC</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Évaluation</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Poids</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Poids(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Bloc</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>Consommation d&apos;air(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>SNC max</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Profondeur(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Température(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3535,7 +3437,7 @@ veuillez envoyer les informations suivantes aux développeurs. </translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Lieu : </translation>
     </message>
@@ -3661,7 +3563,7 @@ veuillez envoyer les informations suivantes aux développeurs. </translation>
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Gestion des sites de plongée</translation>
     </message>
@@ -3683,7 +3585,7 @@ veuillez envoyer les informations suivantes aux développeurs. </translation>
 cette opération. Voulez-vous vraiment continuer ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Vous modifiez un site de plongée</translation>
     </message>
@@ -3993,6 +3895,26 @@ cette opération. Voulez-vous vraiment continuer ?</translation>
         <translation>Ajouter un système de poids</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR (Recycleur)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. de l&apos;air. [%1]</translation>
@@ -4030,69 +3952,69 @@ cette opération. Voulez-vous vraiment continuer ?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Plongée la plus profonde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Plongée la moins profonde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Consommation d&apos;air (SAC) maximale d&apos;une plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Consommation d&apos;air (SAC) minimale d&apos;une plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Consommation d&apos;air (SAC) moyenne des plongée sélectionnées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Température maximale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Température minimale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Température moyenne des plongées sélectionnées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Plongée la plus longue</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Plongée la plus courte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Durée moyenne des plongées sélectionnées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4101,22 +4023,22 @@ mélangés à partir de l&apos;air et en utilisant :
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation> et </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Nouveau site de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Abandonner les modifications ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Vous perdrez les modifications non enregistrées.</translation>
     </message>
@@ -4269,7 +4191,7 @@ mélangés à partir de l&apos;air et en utilisant :
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
@@ -4522,7 +4444,7 @@ mélangés à partir de l&apos;air et en utilisant :
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>&amp;Annuler</translation>
     </message>
@@ -4535,7 +4457,7 @@ mélangés à partir de l&apos;air et en utilisant :
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>&amp;Refaire</translation>
     </message>
@@ -4770,144 +4692,144 @@ mélangés à partir de l&apos;air et en utilisant :
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Ouvrir un fichier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Traverser les dossiers d&apos;images</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Scanner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Analyse des images ... (Ceci peut prendre un certain temps)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Veuillez enregistrer ou annuler vos modifications en cours avant de fermer le fichier.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d&apos;ajouter une nouvelle plongée.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Imprimer le tableau de runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Tentative de modification d&apos;une plongée qui n&apos;a pas été ajoutée manuellement.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Voulez-vous enregistrer les modifications du fichier %1 ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Voulez-vous enregistrer les modifications du fichier de données ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Enregistrer les modifications ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Enregistrer le fichier sous</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[stockage dans le cloud pour] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Ouverture d&apos;un fichier de données d&apos;une version plus ancienne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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>Vous avez ouvert un fichier de données d&apos;une version plus ancienne de Subsurface. Nous vous recommandons de lire le manuel à propos des modifications apportées par la nouvelle version, particulièrement à propos de la gestion des sites de plongées qui a été grandement modifiée.
 Subsurface a déjà essayé de pré-remplir les données mais il est préférable que vous regardiez le nouveau système de gestion des sites de plongées pour vous assurer que tout est correct.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Ouvrir le fichier de carnet de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Fichiers de carnet de plongée (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Fichiers Cochran (*.can *.CAN);;CSV files (*.csv *.CSV);;Fichiers DiveLog.de (*.dld *.DLD);;Fichiers JDiveLog (*.jlb *.JLB);;Fichiers Liquivision (*.lvd *.LVD);;Fichiers MkVI (*.txt *.TXT);;Fichiers Suunto (*.sde *.db *.SDE *.DB);;Fichiers Divesoft (*.dlf *.DLF);;Fichiers UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Fichiers XML (*.xml *.XML);;APD log viewer (*.apd *.APD);;Fichiers Datatrak/WLog (*.log *.LOG);;Fichiers OSTCtools (*.dive *.DIVE);;Tous les fichiers (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Contact du service cloud...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Les modifications seront perdues si vous ne les enregistrez pas.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d&apos;ouvrir un nouveau fichier.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Tentative de replanification d&apos;une plongée qui n&apos;est pas une plongée planifiée.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Statistiques annuelles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Merci de finir l&apos;édition en cours avant d&apos;en commencer une autre.</translation>
     </message>
@@ -4925,7 +4847,7 @@ Subsurface a déjà essayé de pré-remplir les données mais il est préférabl
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Le Filtre affiche %1 (de %2) plongées</translation>
     </message>
@@ -6043,12 +5965,12 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>OXYGÈNE</translation>
     </message>
@@ -6088,42 +6010,53 @@ Veuillez démarrer le Bluetooth sur votre OSTC Sport et effectuez la même prép
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>pieds</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>pieds³</translation>
     </message>
@@ -6599,7 +6532,7 @@ de 30 minutes avant le début de la plongée et 30 minutes après la fin.</trans
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Combinaisons : </translation>
     </message>
@@ -6626,7 +6559,7 @@ de 30 minutes avant le début de la plongée et 30 minutes après la fin.</trans
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Étiquettes : </translation>
     </message>
@@ -6820,16 +6753,10 @@ de 30 minutes avant le début de la plongée et 30 minutes après la fin.</trans
         <translation>Couleur6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Voulez-vous enregistrer vos modifications ?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>Vous êtes sur le point de modifier un modèle fourni par Subsurface.</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6913,10 +6840,105 @@ de 30 minutes avant le début de la plongée et 30 minutes après la fin.</trans
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation>(%1 affiché(s))</translation>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>N°</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Évaluation</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Profondeur(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>pieds</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Durée</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Température(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Poids(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>livre US</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Combinaison</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Bloc</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gaz</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>Consommation d&apos;air(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>SNC max</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Lieu</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7014,8 +7036,8 @@ de 30 minutes avant le début de la plongée et 30 minutes après la fin.</trans
         <translation>Manuel utilisateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Impossible de trouver le manuel de Subsurface</translation>
     </message>
@@ -7431,7 +7453,7 @@ Maximum</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Erreur d&apos;analyse de l&apos;entête</translation>
     </message>
@@ -7510,7 +7532,7 @@ Maximum</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
@@ -7614,7 +7636,7 @@ Maximum</translation>
         <translation>Pas trouvé d&apos;ordinateur de plongée pour le fichier &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>aucun</translation>
     </message>
@@ -7622,7 +7644,7 @@ Maximum</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>Palier de décompression</translation>
     </message>
@@ -7635,7 +7657,7 @@ Maximum</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7643,45 +7665,45 @@ Maximum</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>remontée</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>plafond</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>charge</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>transmetteur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>violation</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>signet</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>surface</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>palier de sécurité</translation>
     </message>
@@ -7690,193 +7712,193 @@ Maximum</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>Changement de gaz</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>palier de sécurité (volontaire)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>palier de sécurité (obligatoire)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>Palier profond</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>plafond (palier de sécurité)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>Durée de plongée</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>sous la profondeur plancher</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>profondeur max</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>Durée à l&apos;air</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>entête</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>Avertissement de niveau de tissus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>Durée sans arrêt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>numéro d&apos;évènement non valide</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Impossible de créer un analyseur pour %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Impossible d&apos;enregistrer les données</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Impossible d&apos;analyser la date</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Plongée %d : %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Erreur lors de l&apos;analyse de la durée de plongée</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Erreur d&apos;analyse de la profondeur maximale</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Erreur d&apos;analyse de la température</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Erreur d&apos;analyse du nombre de mélanges gazeux</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Erreur lors de l&apos;obtention de la salinité de l&apos;eau</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erreur lors de l&apos;obtention de la pression en surface</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Erreur lors de l&apos;obtention du mode de plongée</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Erreur d&apos;analyse du mélange gazeux</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Erreur d&apos;analyse des échantillons</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Évènement : attente d&apos;une action de l&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modèle = %u (0x%08x), firmware = %u (0x%08x), numéro de série = %u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Erreur d&apos;enregistrement du gestionnaire d&apos;évènements.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erreur d&apos;enregistrement du gestionnaire d&apos;annulation.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Erreur d&apos;import des données de plongées</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossible de créer un contexte libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Impossible d&apos;ouvrir %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Privilèges insuffisants pour ouvrir le périphérique %s %s (%s)</translation>
     </message>
@@ -8088,7 +8110,7 @@ Maximum</translation>
         <translation>nitrox</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8097,70 +8119,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>Consommation d&apos;air en surface (SAC) : %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>SNC : %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8169,7 +8191,7 @@ PEDA : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8178,70 +8200,70 @@ PEDA : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Palier de sécurité : %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Palier de sécurité : temps inconnu @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Déco : %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Déco : temps inconnu @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>En déco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>LND  : %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>DTR : %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Déco : %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>En déco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>LND : %umin (calc)
@@ -8249,98 +8271,98 @@ PEDA : %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>LND : &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>DTR : %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>DTR : &gt;2h (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT : %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Plafond calculé %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tissus %.0fmin : %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>rythme cardiaque : %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>palier : %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Profondeur moyenne jusqu&apos;ici %.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sPd:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sPd:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8375,16 +8397,6 @@ PEDA : %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 plongées)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 plongée)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>bateau</translation>
@@ -8658,42 +8670,47 @@ PEDA : %d%s
         <translation>plus de %d jours</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dj %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>pour les plongées n°</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>pour les plongées sélectionnées</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>pour la plongée n°%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>pour la plongée sélectionnée</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>pour toutes les plongées</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(pas de plongées)</translation>
     </message>
@@ -8793,7 +8810,7 @@ PEDA : %d%s
         <translation>Déc.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts
index d939a714b..06456d96b 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>אדם:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>חיפושים לבני זוג ודייבמסטרים</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>להשתמש</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>לחיצה פה יהסיר את המיכל הזה</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>אין יכולת להסיר את המיכל</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>הגז בשימוש. רק ניתן להסיר מיכלים שלא בשימוש בצלילה.</translation>
     </message>
@@ -1898,104 +1898,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>תאריך</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>דירוג</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>עומק (%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>מטר</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>רגל</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>משך הצלילה</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>טמפרטורה(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>משקל(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>קילוגרם</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>ליברה</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>חליפה</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>מיכל</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>גז</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>צריכת גז (%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>לדקה</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>רעילות שייורית מקסימלית</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>מיקום</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2096,12 +1998,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>יצירת אתר צלילה חדש, העתקת מידע רלוונטי מהצלילה הנוכחית.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>יצירת אתר צלילה חדש בשם זה</translation>
     </message>
@@ -2787,32 +2689,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>עומק מירבי</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>גז שנוצל</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>נקודה קבוע למערכת סגורה</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>טמפ</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>צריכת אויר</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>משקל(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>מיכל</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>גז</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>צריכת גז (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>רעילות שייורית מקסימלית</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>עומק (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>טמפרטורה(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3536,7 +3438,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>מיקום:</translation>
     </message>
@@ -3662,7 +3564,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>ניהול אתרי צלילה</translation>
     </message>
@@ -3684,7 +3586,7 @@ p, li { white-space: pre-wrap; }
 האם אתה בטוח שאתה רוצה להמשיך?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>הינך עורך אתר צלילה</translation>
     </message>
@@ -3994,6 +3896,26 @@ p, li { white-space: pre-wrap; }
         <translation>הוסף מערכת משקולות</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>מעגל פתוח</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>מערכת סגורה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>מערכת חצי סגורה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>טמפ&apos; האוויר [%1]</translation>
@@ -4031,69 +3953,69 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>צלילה מירבי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>צלילה רדוד ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>צריכת גז מירבי בצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>צריכת גז מינימלי בצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>צריכת גז ממוצע בצלילות הנבחרות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>טמפ&apos; מירבי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>טמפ&apos; נמוכה ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>טמפ&apos; ממוצה לצלילות הנבחרות ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>צלילה ארוכה ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>צלילה קצרה ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>זמן ממוצה לצלילות הנבחרות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4102,22 +4024,22 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>ו-</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>אתר צלילה חדשה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>למחוק שינוים?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>אתה עומד למחוק את השינויים.</translation>
     </message>
@@ -4270,7 +4192,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>פתח</translation>
     </message>
@@ -4523,7 +4445,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>לבטל שינוי</translation>
     </message>
@@ -4536,7 +4458,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>בצע שינוי שוב</translation>
     </message>
@@ -4771,144 +4693,144 @@ mixed from Air and using:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>פתך קובץ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>בטל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>לחצות ספריות של תמונת</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>סרוק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>סורק תמונות... (יכול להיות תהליך ערוך)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני סגירת הקובץ.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני שאתה מנסה להוסיף צלילה.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>הדפס טבלת זמנים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>מנסה לערוך צלילה שלא צלילה ידני.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>האם ברצונכם לשמור שינויים בקובץ %1 ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>האם לשמור שינויים בקובץ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>שמור שינוים?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>שמור קובץ בשם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[אחסון בענן ל-] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>פותח קובץ מגרסה ישנה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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>אתה פתחת קובץ נתונים מגירסה ישנה יותר של Subsurface. אנו ממליצים לך לקרוא את המדריך כדי ללמוד על השינויים בגרסה החדשה, במיוחד על ניהול אתר צלילה שהשתנה הרבה.
 Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל יכול להיות שווה לבדוק במערכת ניהול אתר צלילה החדשה ולוודא שהכל נראה תקין.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>פתך קובץ יומן צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>קבצי יומני צלילה (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN*.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;קבצי Cochran (*.can *.CAN);;CSV files (*.csv *.CSV);;קבצי DiveLog.de (*.dld *.DLD);;קבצי JDiveLog (*.jlb *.JLB);;קבצי Liquivision (*.lvd *.LVD);;קבצי MkVI (*.txt *.TXT);;קבצי Suunto (*.sde *.db *.SDE *.DB);;קבצי Divesoft (*.dlf *.DLF);;קבצי UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;קבצי XML (*.xml *.XML);;קבצי APD (*.apd *.APD);;קבצי Datatrak/WLog (*.log *.LOG);;קבצי OSTCtools (*.dive *.DIVE);;כל קבצים (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>מתחבר לאחסון בענן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני פתיחת קובץ חדש.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>מנסה לערוך מחדש צלילה שלא צלילה ידני.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>סטטיסטיקה שנתית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>ראשית תסיים את המהדורה הנוכחית לפני שאתה מנסה לעשות אחר.</translation>
     </message>
@@ -4926,7 +4848,7 @@ Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל יכ
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>סינון מציג %1 (מתוך %2) צלילות</translation>
     </message>
@@ -6044,12 +5966,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>אוויר</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>חמצן</translation>
     </message>
@@ -6089,42 +6011,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>דקה</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6600,7 +6533,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>חליפות:</translation>
     </message>
@@ -6627,7 +6560,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>תגיות:</translation>
     </message>
@@ -6821,17 +6754,10 @@ Not all images have timestamps in the range between
         <translation>צבע 6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>האם לשמור שינויים?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>אתה עומד לשנות תבנית שבא יחד עם Subsurface.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6915,10 +6841,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation>(%1 מוצג)</translation>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>תאריך</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>דירוג</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>עומק (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>מטר</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>רגל</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>משך הצלילה</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>טמפרטורה(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>משקל(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>קילוגרם</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>ליברה</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>חליפה</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>מיכל</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>גז</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>צריכת גז (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>לדקה</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>רעילות שייורית מקסימלית</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>מיקום</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7016,8 +7037,8 @@ Not all images have timestamps in the range between
         <translation>מדריך משתמש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>קובץ המדריך למשתמש לא נמצא</translation>
     </message>
@@ -7432,7 +7453,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>שגיאת בניתוח הכותרת</translation>
     </message>
@@ -7511,7 +7532,7 @@ Maximum</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) או (%s)</translation>
     </message>
@@ -7615,7 +7636,7 @@ Maximum</source>
         <translation>לא נמצא  מחשב צלילה מתאמה לקובץ &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>אין</translation>
     </message>
@@ -7623,7 +7644,7 @@ Maximum</source>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>עצירה לדיקומפרסיה</translation>
     </message>
@@ -7636,7 +7657,7 @@ Maximum</source>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>זמן נותר בעומק</translation>
     </message>
@@ -7644,45 +7665,45 @@ Maximum</source>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>עליה</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>תקרה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>עומס</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>משדר</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>חריגה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>סימניה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>שטח</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>עצירת בטיחות</translation>
     </message>
@@ -7691,193 +7712,193 @@ Maximum</source>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>החלפת גז</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>עצירת בטיחות (יזומה)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>עצירת בטיחות (חובה)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>עצירה בעומק</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>תקרה (עצירת בטיחות)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>מתחת לרצפת דקו</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>עומק מקס&apos;</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>זמן אויר</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>כותרת</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>אזהרת רמות רקמות</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>זמן ללא עצירה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>מס&apos; ארוע שגוי</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>לא מצליח להבין %s %s </translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>שגיאה ברישום המידע</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>שגיאה בקריאת תאריך</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>צלילה %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>שגיאה בקריאת זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>שגיאה בקריאת עומק מקסימלי</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>שגיאה בקריאת טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>שגיאה בקריאת תערובת גזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>שגיאה בקבלת מליחות מים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>שגיאה בקבלת לחץ על פני המים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>שגיאה בקבלת מוד צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>שגיאה בקריאת תערובת הגזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>שגיאה בקריאת נקודות דגימה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>אירוע: מחכה לפעולה של המשתמש</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>דגם=%u (0x%08x), הקושחה=%u (0x%08x), מספר סידורי=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>שגיאה ברישום שגרת ניהול</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>שגיאה בעת רישום שגרת הביטול.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>שגיאת יבוא נתוני צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>לא ניתן לייצר אובייקט של libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>לא ניתן לפתוח את %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>הרשאות לא מספיקות כדי לפתוח את המכשיר  %s %s (%s)</translation>
     </message>
@@ -8089,7 +8110,7 @@ Maximum</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8098,70 +8119,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>צריכת גז: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>רעילות שייורית מקסימלית %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2f בר
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2f בר
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2f בר
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8170,7 +8191,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8179,169 +8200,169 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>תחנת בטיחות: %u דקות @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>תחנת בטיחות: זמן לא ידוע @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>דקו: %u דקות @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>דקו: זמן לא ידוע @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>בדקו
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %u דקות
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %u דקות
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>דקו: %u דקות @ %.0f%s (מחושב)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>בדקו (חישוב)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %u דקות (מחושב)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt; שעתיים (מחושב)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %u דקות (מחושב)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt; שעתיים (מחושב)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %u דקות
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>תקרה %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>רקמה %.0f דקות: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>פעימות לב %d</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>כיוון: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>עומק ממוצע לכאן %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8376,16 +8397,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 צלילות)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 צלילה)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>ספינה</translation>
@@ -8659,42 +8670,47 @@ EADD: %d%s
         <translation>יותר מ-%d ימים</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>לצלילות #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>לצלילות שנבחרו</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>לצלילה #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>לצלילה שנבחרה</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>לכל הצלילות</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(שום צלילות)</translation>
     </message>
@@ -8794,7 +8810,7 @@ EADD: %d%s
         <translation>דצמבר</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index a3331c591..713da2fad 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -1714,17 +1714,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1896,104 +1896,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>Br.</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Ocjena</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Trajanje</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Odijelo</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Boca</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Lokacija</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2094,12 +1996,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation type="unfinished"/>
     </message>
@@ -2785,32 +2687,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3015,127 +2917,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>Br.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Ocjena</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Težina</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Odijelo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Boca</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3525,7 +3427,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3651,7 +3553,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation type="unfinished"/>
     </message>
@@ -3672,7 +3574,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -3982,6 +3884,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
@@ -4019,91 +3941,91 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -4256,7 +4178,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
@@ -4509,7 +4431,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
@@ -4522,7 +4444,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
@@ -4757,143 +4679,143 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -4911,7 +4833,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -6027,12 +5949,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>Zrak</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
@@ -6072,42 +5994,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6575,7 +6508,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -6602,7 +6535,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -6796,16 +6729,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6889,10 +6816,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>Br.</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Ocjena</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Trajanje</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Odijelo</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Boca</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Lokacija</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -6990,8 +7012,8 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"/>
     </message>
@@ -7392,7 +7414,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7471,7 +7493,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ili (%s)</translation>
     </message>
@@ -7575,7 +7597,7 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>nijedan</translation>
     </message>
@@ -7583,7 +7605,7 @@ Maximum</source>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>deko zastoj</translation>
     </message>
@@ -7596,7 +7618,7 @@ Maximum</source>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7604,45 +7626,45 @@ Maximum</source>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>izron</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>strop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>opterećenje</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>odašiljač</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>povreda</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>bookmark</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>površina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>sigurnosna stanka</translation>
     </message>
@@ -7651,193 +7673,193 @@ Maximum</source>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>promjena plina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>sigurnosna stanka (opcionalna)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>sigurnosna stanka (obavezna)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>dubinska stanka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>strop (sigurnosni zastoj)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>trajanje urona</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>Max dubina</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>preostalo trajanje zraka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>kurs</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>upozorenje tkivo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>non stop vrijeme</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>neispravan broj događaja</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Ne mogu kreirati parser za %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Greška pri registraciji podataka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Greška pri parsiranju datuma i vremena</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Greška pri parsiranju vremena urona</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Greška pri parsiranju maksimalne dubine</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Greška pri parsiranju broja mješavina</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Greška pri dohvaćanju saliniteta vode</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Greška pri parsiranju mješavine plinova</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Greška pri parsiranju uzoraka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Događaj: čekanje na korisničku akciju</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Greška pri registraciji event handlera.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Greška pri registraciji cancellation handlera</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Greška pri uvozu podataka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ne mogu kreirati libdivecomputer kontekst</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nije uspjelo otvaranje %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -8048,225 +8070,225 @@ Maximum</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
@@ -8301,16 +8323,6 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>brod</translation>
@@ -8584,42 +8596,47 @@ EADD: %d%s
         <translation>više od %d dana</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>za urone #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>za odabrane urone</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>za uron #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>za odabrani uron</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>za sve urone</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(nema urona)</translation>
     </message>
@@ -8719,7 +8736,7 @@ EADD: %d%s
         <translation>Pro</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts
index 93ba3c55a..02569b83c 100644
--- a/translations/subsurface_hu.ts
+++ b/translations/subsurface_hu.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -1714,17 +1714,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1896,104 +1896,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Tartam</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Pal</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Hely</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2094,12 +1996,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation type="unfinished"/>
     </message>
@@ -2785,32 +2687,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3015,127 +2917,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Mélység</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Pal</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Tartam</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
@@ -3525,7 +3427,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3651,7 +3553,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation type="unfinished"/>
     </message>
@@ -3672,7 +3574,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -3982,6 +3884,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
@@ -4019,91 +3941,91 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -4256,7 +4178,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
@@ -4509,7 +4431,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
@@ -4522,7 +4444,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
@@ -4757,143 +4679,143 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -4911,7 +4833,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -6027,12 +5949,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>LÉG</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
@@ -6072,42 +5994,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation type="unfinished"/>
     </message>
@@ -6575,7 +6508,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -6602,7 +6535,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -6796,16 +6729,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6889,10 +6816,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Pal</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Hely</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -6990,8 +7012,8 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"/>
     </message>
@@ -7392,7 +7414,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7471,7 +7493,7 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) vagy (%s)</translation>
     </message>
@@ -7575,7 +7597,7 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation type="unfinished"/>
     </message>
@@ -7583,7 +7605,7 @@ Maximum</source>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation type="unfinished"/>
     </message>
@@ -7596,7 +7618,7 @@ Maximum</source>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation type="unfinished"/>
     </message>
@@ -7604,45 +7626,45 @@ Maximum</source>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation type="unfinished"/>
     </message>
@@ -7651,193 +7673,193 @@ Maximum</source>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Hiba az adat regisztrálása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Hiba a dátumidő feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Hiba a merülési idő feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Hiba a max mélység feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <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="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Hiba a víz sótartalmának lekérdezésekor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Hiba a gáz keverék feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Hiba a minták feldolgozása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Esemény: várakozás a felhasználóra</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Hiba az esemény kezelő regisztrálása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Hiba a visszavonás kezelő regisztrálása alatt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Merülési adat importálási hiba</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -8047,225 +8069,225 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
@@ -8300,16 +8322,6 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation type="unfinished"/>
@@ -8583,42 +8595,47 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dn %dó %dp</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dó %dp</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(nincs merülés)</translation>
     </message>
@@ -8718,7 +8735,7 @@ EADD: %d%s
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts
index dd58aa479..731ec4404 100644
--- a/translations/subsurface_id.ts
+++ b/translations/subsurface_id.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Personil:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Cari teman dan divemaster</translation>
     </message>
@@ -1714,17 +1714,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1896,104 +1896,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Tanggal</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Peringkat</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Durasi</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kgkg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Pakaian</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/menit</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Lokasi</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2094,12 +1996,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation type="unfinished"/>
     </message>
@@ -2785,32 +2687,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3015,127 +2917,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Peringkat</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>edalaman</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Berat</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Pakaian</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/menit</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3525,7 +3427,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3651,7 +3553,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation type="unfinished"/>
     </message>
@@ -3672,7 +3574,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -3982,6 +3884,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
@@ -4019,91 +3941,91 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -4256,7 +4178,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Buka</translation>
     </message>
@@ -4509,7 +4431,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
@@ -4522,7 +4444,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
@@ -4757,143 +4679,143 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <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="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -4911,7 +4833,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -6027,12 +5949,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>UDARA</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
@@ -6072,42 +5994,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>menit</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>I</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6575,7 +6508,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -6602,7 +6535,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -6796,16 +6729,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6889,10 +6816,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Tanggal</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Peringkat</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Durasi</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kgkg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Pakaian</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/menit</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Lokasi</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -6990,8 +7012,8 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Panduan Subsurface tak dapat ditemukan</translation>
     </message>
@@ -7400,7 +7422,7 @@ Rata-rata</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7479,7 +7501,7 @@ Rata-rata</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) or (%s)</translation>
     </message>
@@ -7583,7 +7605,7 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>kosong</translation>
     </message>
@@ -7591,7 +7613,7 @@ Rata-rata</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>pemberhentian deco</translation>
     </message>
@@ -7604,7 +7626,7 @@ Rata-rata</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7612,45 +7634,45 @@ Rata-rata</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>nai</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>batas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>beban kerja</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>pemancar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>gangguan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>tandai</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>permuakaan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation type="unfinished"/>
     </message>
@@ -7659,193 +7681,193 @@ Rata-rata</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>ganti gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>safety stop (bebas)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>safety stop (wajib)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>batas (safety stop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>waktu selam</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>dalam maks</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>waktu mengudara</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>judul</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>peringatan tingkat jaringan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>waktu non stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>nomor kejadian tidak sesuai</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>tidak dapat membuat pengurai untuk %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Gagal mendaftarkan data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Gagal mengurai tanggal</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Gagal mengurai waktu selam</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Gagal mengurai kedalamn maks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Gagal mengurai perhitungan campuran gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -8055,225 +8077,225 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
@@ -8308,16 +8330,6 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation type="unfinished"/>
@@ -8591,42 +8603,47 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation type="unfinished"/>
     </message>
@@ -8726,7 +8743,7 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index d36285108..c26946250 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Persona:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Ricerca compagni di immersione e Divemaster</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Uso</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Cliccando qui si rimuove la bombola.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>La bombola non può essere rimossa</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Questo gas è in uso. Solo le bombole che non sono in uso nell&apos;immersione possono essere rimosse.</translation>
     </message>
@@ -1899,104 +1899,6 @@ il computer selezionato?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>n</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Valutazione</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Prof. (%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Durata</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temp (%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Peso(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Muta</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Bombola</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>CAS(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>CNS massimo</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Luogo</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@ il computer selezionato?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Crea un nuovo sito di immersione copiando le principali informazioni dall&apos;immersione corrente.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Crea un nuovo sito d&apos;immersione con questo nome</translation>
     </message>
@@ -2788,32 +2690,32 @@ il computer selezionato?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Profondità finale</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Run Time</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Gas utilizzato</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Valutazione</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Peso(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Muta</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Bombola</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>CAS(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>CNS massimo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Prof. (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temp (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3536,7 +3438,7 @@ invia il testo che segue ai programmatori.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Luogo:</translation>
     </message>
@@ -3662,7 +3564,7 @@ invia il testo che segue ai programmatori.
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Gestione dei siti di immersione</translation>
     </message>
@@ -3684,7 +3586,7 @@ invia il testo che segue ai programmatori.
 Sei sicuro di voler continuare?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Stai modificando un sito di immersione</translation>
     </message>
@@ -3994,6 +3896,26 @@ Sei sicuro di voler continuare?</translation>
         <translation>Aggiungi la tipologia della pesata</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation>Apnea</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. aria [%1]</translation>
@@ -4031,69 +3953,69 @@ Sei sicuro di voler continuare?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Immersione più profonda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Immersione più superficiale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>CAS totale più alto di una immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>CAS totale più basso di una immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>CAS totale medio di tutte le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Temperatura più alta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Temperatura più bassa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Temperatura media di tutte le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Immersione più lunga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Immersione più corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Durata media di tutte le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4102,22 +4024,22 @@ mixati con aria e usando:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Nuovo sito d&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Elimino le modifiche?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Stai per cancellare le modifiche.</translation>
     </message>
@@ -4270,7 +4192,7 @@ mixati con aria e usando:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
@@ -4523,7 +4445,7 @@ mixati con aria e usando:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>&amp;Annulla</translation>
     </message>
@@ -4536,7 +4458,7 @@ mixati con aria e usando:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>&amp;Ripeti</translation>
     </message>
@@ -4771,144 +4693,144 @@ mixati con aria e usando:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Apri file</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Visita le cartelle delle immagini</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Scansione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Lettura delle immagine (può impiegarci parecchio)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Per favore, salva o cancella le modifiche all&apos;immersione prima di chiudere il file.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Per favore, salva o cancella le modifiche all&apos;immersione prima di aggiungerne un&apos;altra.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Stampa la tabella con il runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Sto cercando di modificare una immersione che non è stata creata manualmente.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Vuoi salvare le modifiche fatte nel file %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Vuoi salvare le modifiche fatte nel file di dati?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Salvo le modifiche?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Apri file come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[memoria cloud per] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Apertura di un file di dati da una vecchia versione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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>Hai aperto un file di dati da una vecchia versione di Subsurface. Ti consigliamo di leggere il manuale per approfondire le modifiche apportate alla nuova versione, con particolare riguardo alla gestione dei siti di immersione che è cambiata in modo significativo.
 Subsurface ha già cercato di convertire i dati in maniera automatica ma sarebbe il caso di dare un&apos;occhiata alla gestione dei siti di immersione per controllare che tutto sia a posto.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Apri file di log immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Sto contattando il servizio cloud...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Le modifiche saranno perse se tu non le salvi.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Per favore, salva o cancella le modifiche all&apos;immersione prima di aprire un nuovo file.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Si sta cercando di ripianificare una immersione che non è una immersione pianificata.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Statistiche Annuali</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Per favore, prima completa le modifiche corrente prima di aggiungerne altre.</translation>
     </message>
@@ -4926,7 +4848,7 @@ Subsurface ha già cercato di convertire i dati in maniera automatica ma sarebbe
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>I Filtri mostrano %1 (di %2) immersioni</translation>
     </message>
@@ -6044,12 +5966,12 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>ARIA</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>OSSIGENO</translation>
     </message>
@@ -6089,42 +6011,53 @@ Avvia il Bluetooth sul tuo OSTC Sport e, prima di continuare con l&apos;aggiorna
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation>(%1 immersioni)</translation>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation>(1 immersione)</translation>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>piedi cubi</translation>
     </message>
@@ -6601,7 +6534,7 @@ selezionate.</translation>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Mute:</translation>
     </message>
@@ -6628,7 +6561,7 @@ selezionate.</translation>
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Tag:</translation>
     </message>
@@ -6822,16 +6755,10 @@ selezionate.</translation>
         <translation>Colore 6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Vuoi salvare le tue modifiche?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>Stai per modificare un modello fornito con Subsurface</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6915,10 +6842,105 @@ selezionate.</translation>
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation> (%1 mostrati)</translation>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>n</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Valutazione</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Prof. (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Durata</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temp (%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Peso(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Muta</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Bombola</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>CAS(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>CNS massimo</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Luogo</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7016,8 +7038,8 @@ selezionate.</translation>
         <translation>Manuale utente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Manuale di Subsurface non trovato</translation>
     </message>
@@ -7431,7 +7453,7 @@ Media</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Errore  nel parsing dell&apos;intestazione</translation>
     </message>
@@ -7510,7 +7532,7 @@ Media</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) o (%s)</translation>
     </message>
@@ -7614,7 +7636,7 @@ Media</translation>
         <translation>Nessun computer corrispondente per il file &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>nessuno</translation>
     </message>
@@ -7622,7 +7644,7 @@ Media</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>deco stop</translation>
     </message>
@@ -7635,7 +7657,7 @@ Media</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7643,45 +7665,45 @@ Media</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>risalita</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>ceiling</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>carico di lavoro</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>trasmettitore</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>violazione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>segnalibro</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>superficie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>sosta di sicurezza</translation>
     </message>
@@ -7690,193 +7712,193 @@ Media</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>cambio gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>sosta di sicurezza (facoltativa)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>sosta di sicurezza (obbligatoria)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (sosta di sicurezza)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>durata immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>sotto il piano</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>profondità massima</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>tempo in aria</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>intestazione</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>avviso del livello dei tessuti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>tempo di non stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>numero evento non valido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Impossibile creare un parser per %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Errore registrando la data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Errore analizzando la data/il tempo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Immersione #%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Errore analizzando il tempo di immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Errore analizzando la profondità massima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Errore analizzando la temperatura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Errore analizzando il conteggio della miscela di gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Errore nell&apos;ottenimento della salinità dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Errore nell&apos;ottenere la pressione superficiale</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Errore nell&apos;ottenere la modalità di immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Errore analizzando la miscela di gas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Errore analizzando i campioni</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: in attesa dell&apos; azione dell&apos;utente.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modello=%u (0x%08x), firmware=%u (0x%08x), numero di serie=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Errore registrando il gestore degli eventi.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Errore registrando il gestore della cancellazione.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Errore importazione dati immersione</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossibile creare un contesto libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Impossibile aprire %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Privilegi insufficienti per aprire il dispositivo %s %s (%s)</translation>
     </message>
@@ -8089,7 +8111,7 @@ Media</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8098,28 +8120,28 @@ D:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P:%d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>CAS: %.*f%s/min
@@ -8127,42 +8149,42 @@ D:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN₂ %s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8171,7 +8193,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8180,170 +8202,170 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sosta di sicurezza: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sosta di sicurezza: @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: temo di sosta sconosciuto @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL:%umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Ceiling calcolato %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tessuti %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>Battito cardiaco: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>Direzione: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>Profondità media fin qui %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8378,16 +8400,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 immersioni)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 immersione)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>barca</translation>
@@ -8661,42 +8673,47 @@ EADD: %d%s
         <translation>più di %d giorni</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dG %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation>%dmin %ds</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>per l&apos;immersione nº</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>per le immersioni selezionate</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>per l&apos;immersione nº%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>per l&apos;immersione selezionata</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>per tutte le immersioni</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(nessuna immersione)</translation>
     </message>
@@ -8796,7 +8813,7 @@ EADD: %d%s
         <translation>Dic</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts
index 64e621fd4..c94cc99f8 100644
--- a/translations/subsurface_lv_LV.ts
+++ b/translations/subsurface_lv_LV.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -1714,17 +1714,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Noklikšķot šeit Jūs noņemsiet balonu.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Balons never būt noņemts.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Šī gāze jau ir pielietota. Var noņemt tikai tos cilindrus, kuri nav pielietoti niršanā.</translation>
     </message>
@@ -1897,104 +1897,6 @@ likvidēt izvēlētus datorus?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Datums</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Novērtējums</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Ilgums</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>mārciņa</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Kostīms</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Balons</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Maks. CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Vieta</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2095,12 +1997,12 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation type="unfinished"/>
     </message>
@@ -2786,32 +2688,32 @@ likvidēt izvēlētus datorus?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>nezināms</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Gala dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Izpildes laiks</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Izm. gāze</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3016,127 +2918,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Novērtējums</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Dziļums</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temp.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Svars</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Kostīms</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Balons</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Maks. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Vieta</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Ilgums</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>mārciņa</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3527,7 +3429,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3653,7 +3555,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation type="unfinished"/>
     </message>
@@ -3674,7 +3576,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -3984,6 +3886,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Gaisa temp. [%1]</translation>
@@ -4021,91 +3943,91 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Visdziļākā niršana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>un</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Atcelt izmaiņas?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Jūs taisāties atcelt izmaiņas.</translation>
     </message>
@@ -4258,7 +4180,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Atvērt</translation>
     </message>
@@ -4511,7 +4433,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
@@ -4524,7 +4446,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
@@ -4759,143 +4681,143 @@ mixed from Air and using:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Atvērt failu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Atcelt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms fails aizvēršanas.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms niršanas pievienošanas.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Izdrukāt niršanas tabulu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Vai velāties saglabāt izmaiņas datnē %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Vai velāties saglabāt izmaiņas datnes datu datnē?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Saglabāt izmaiņas?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Saglabāt kā</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Atvērt niršanas žurnālu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Izmaiņas pazūs, ja tos nesaglabāt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Brīdinājums</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms jauna faila atveršanas.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Gada statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Lūdzu, pabeidziet tekošo rediģēšanu pirms mēģinot citu.</translation>
     </message>
@@ -4913,7 +4835,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -6029,12 +5951,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>Gaisa</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
@@ -6074,42 +5996,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>mārciņa</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>pēda</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>kub. pēda</translation>
     </message>
@@ -6577,7 +6510,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -6604,7 +6537,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -6798,16 +6731,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6891,10 +6818,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Datums</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Novērtējums</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Ilgums</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>mārciņa</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Kostīms</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Balons</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Maks. CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Vieta</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -6992,8 +7014,8 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Nevar atrast Subsurface rokasgrāmatu</translation>
     </message>
@@ -7405,7 +7427,7 @@ Vidējais</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7484,7 +7506,7 @@ Vidējais</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) vai (%s)</translation>
     </message>
@@ -7588,7 +7610,7 @@ Vidējais</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>neviens</translation>
     </message>
@@ -7596,7 +7618,7 @@ Vidējais</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>deko pietura</translation>
     </message>
@@ -7609,7 +7631,7 @@ Vidējais</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7617,45 +7639,45 @@ Vidējais</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>stāvums</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>maksimāla dekompr. pietura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>darba slodze</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>raidītājs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>pārkapšana</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>grāmatzīme</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>virsma</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>drošības pietura</translation>
     </message>
@@ -7664,193 +7686,193 @@ Vidējais</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>gāzes maiņa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>drošības pietura (brīvprātīga)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>drošības pietura (obligāta)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>dziļa pietura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>maksimāla dekompr. pietura (drošības pietura)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>niršanas laiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>zemāk par grīdu</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>maks. dziļums</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>skābekļa laiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>virziens</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>audu līmeņa brīdinājums</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>bes apstāšanas laiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>kļūdains notikuma numurs</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Nav iespējams izveidot parsētāju priekš %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Kļūda reģistrējot datus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Kļūda parsējot laiku</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Kļūda parsējot niršanas laiku</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Kļūda parsējot maks. dziļumu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Kļūda parsējot gāzes maisījuma daudzumu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Kļūda ūdens sāļuma noteikšanā</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kļūda spiediena noteikšanā uz virsmu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Kļūda parsējot gāzes maisījumu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Kļūda parsējot paraugus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Notikums: gaida lietotāja darbību</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modelis=%u (0x%08x), aparātprogrammatūra=%u (0x%08x), serial numurs=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Kļūda reģistrējot notikumu apstrādātāju.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Kļūda importējot niršanas datus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nevar atvērt %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -8061,7 +8083,7 @@ Vidējais</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8070,70 +8092,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>S: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>L: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>Ā: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8142,7 +8164,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8151,49 +8173,49 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Drošības apstāšana: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Drošības apstāšana: nez. laiks @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Dekompr.: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Dekompr.: nez. laiks @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>Dekompresijā
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
@@ -8202,116 +8224,116 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Dekompr.: %umin @ %.0f%s (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>Dekompresijā (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (izrēķ.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Aprēķināta maks. dekompr. pietura %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>sirdspuksti: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>azimuts: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8346,16 +8368,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 niršanas)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 niršana)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>kuģis</translation>
@@ -8629,42 +8641,47 @@ EADD: %d%s
         <translation>vairāk nekā %d dienas</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dst %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>priekš niršanas #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>priekš izvēlētām niršanām</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>priekš niršanas #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>priekš izvēlētai niršanai</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>priekš visām niršanām</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(nav niršanas)</translation>
     </message>
@@ -8764,7 +8781,7 @@ EADD: %d%s
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index ce3c97d69..7b5424cd2 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Person: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Søk etter buddyer og dykkeledere</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Bruk</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klikk her for å fjerne denne flaska.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaska kan ikke fjernes</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Gassen er i bruk. Bare flasker som ikke er i bruk kan fjernes.</translation>
     </message>
@@ -1898,104 +1898,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Dato</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Vurdering</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Dybde(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Varighet</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temp(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Vekt(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>pund</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Drakt</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Flaske</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gass</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Maks CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Sted</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2096,12 +1998,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Lag et nytt dykkested, og kopier relevant informasjon fra dette dykket</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Opprett dykkested med dette navnet</translation>
     </message>
@@ -2787,32 +2689,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Siste dybde</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Løpetid</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Gassforbruk</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC settpunkt</translation>
     </message>
@@ -3021,127 +2923,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Vurdering</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Vekt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Vekt(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Drakt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Flaske</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gass</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Maks CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Dybde(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temp(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3535,7 +3437,7 @@ send gjerne følgende til utvikleren.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Sted:</translation>
     </message>
@@ -3661,7 +3563,7 @@ send gjerne følgende til utvikleren.
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Dykkestedsdatabase</translation>
     </message>
@@ -3683,7 +3585,7 @@ send gjerne følgende til utvikleren.
 Er du sikker på at du vil fortsette?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Du redigerer et dykkested</translation>
     </message>
@@ -3993,6 +3895,26 @@ Er du sikker på at du vil fortsette?</translation>
         <translation>Legg til vektsystem</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Lufttemp. [%1]</translation>
@@ -4030,69 +3952,69 @@ Er du sikker på at du vil fortsette?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Dypeste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Grunneste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Høyeste totale SAC for et dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Laveste totale SAC for et dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Snitt av total SAC for de valgte dykkene</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Høyeste temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Laveste temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Snittemperatur for de valgte dykkene</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Lengste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Korteste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Snittlengde for de valgte dykkene</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4101,22 +4023,22 @@ fra luft og bruker:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>og</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Nytt dykkested</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Slette endringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Du er i ferd med å droppe endringene dine.</translation>
     </message>
@@ -4269,7 +4191,7 @@ fra luft og bruker:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Åpne</translation>
     </message>
@@ -4522,7 +4444,7 @@ fra luft og bruker:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>Angre</translation>
     </message>
@@ -4535,7 +4457,7 @@ fra luft og bruker:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>Gjør om</translation>
     </message>
@@ -4770,144 +4692,144 @@ fra luft og bruker:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Åpne fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Gå gjennom bildekataloger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Scan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Går gjennom bilder... (dette kan ta en stund)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Lagre eller avbryt redigeringen før du lukker fila.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Lagre eller avbryt redigeringa før du legger til et nytt dykk.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Skriv ut løpetidstabel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Prøver å redigere et dykk som ikke er lagt til manuelt.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Vil du lagre endringene i fila %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Vil du lagre endrinene i datafila?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Lagre endringer?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Lagre fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[skylager for] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Åpner datafil fra eldre versjon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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 åpnet en datafil fra en eldre versjon av Subsurface. Vi anbefaler at du leser manualen for å else om endringene i den nye versjonen, særlig med tanke på dykkestedsdatabasen.
 Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på dykkestedsdatabasen og sjekke at alt er greit.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Åpne dykkelogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Dykkeloggfiler (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran-filer (*.can *.CAN);;CSV-filer (*.csv *.CSV);;DiveLog.de-filer (*.dld *.DLD);;JDiveLog-filer (*.jlb *.JLB);;Liquivision-filer (*.lvd *.LVD);;MkVI-filer (*.txt *.TXT);;Suunto-filer (*.sde *.db *.SDE *.DB);;Divesoft-filer (*.dlf *.DLF);;UDDF-/UDCF-filer (*.uddf *.udcf *.UDDF *.UDCF);;XML-filer (*.xml *.XML);;APD-filer (*.apd *.APD);;Datatrak/WLog-filer (*.log *.LOG);;OSTCtools-filer (*.dive *.DIVE);;Alle filer (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Kontakter skylager...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Endringer vil gå tapt hvis du ikke lagrer.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Lagre eller avbryt redigeringa før du åpner en ny fil.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Prøver å re-planlegge et dykk som ikke allerede er et planlagt dykk.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Årsstatistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Avslutt denne redigeringa før du starter en ny.</translation>
     </message>
@@ -4925,7 +4847,7 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter viser %1 (av %2) dykk</translation>
     </message>
@@ -6043,12 +5965,12 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>Luft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>Oksygen</translation>
     </message>
@@ -6088,42 +6010,53 @@ Start Bluetooth på din OSTC Sport og gjør det du pleier å gjøre når du skal
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
@@ -6599,7 +6532,7 @@ valgte dykk. </translation>
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Drakter:</translation>
     </message>
@@ -6626,7 +6559,7 @@ valgte dykk. </translation>
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Emneord:</translation>
     </message>
@@ -6820,17 +6753,10 @@ valgte dykk. </translation>
         <translation>farge6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Vil du lagre endringene dine?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>Du er i ferd med å endre en mal som følger med Subsurface.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6914,10 +6840,105 @@ valgte dykk. </translation>
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation>(%1 vist)</translation>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Vurdering</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Dybde(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Varighet</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temp(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Vekt(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>pund</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Drakt</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Flaske</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gass</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Maks CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Sted</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7015,8 +7036,8 @@ valgte dykk. </translation>
         <translation>Brukermanual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Finner ikke manualen</translation>
     </message>
@@ -7430,7 +7451,7 @@ Snitt</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Kunne ikke lese header</translation>
     </message>
@@ -7509,7 +7530,7 @@ Snitt</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
@@ -7613,7 +7634,7 @@ Snitt</translation>
         <translation>Ingen matchende computer funnet for fila &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>ingen</translation>
     </message>
@@ -7621,7 +7642,7 @@ Snitt</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>dekostopp</translation>
     </message>
@@ -7634,7 +7655,7 @@ Snitt</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7642,45 +7663,45 @@ Snitt</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>oppstigning</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>tak</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>arbeidsbelastning</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>sender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>brudd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>bokmerke</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>overflate</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>sikkerhetsstopp</translation>
     </message>
@@ -7689,193 +7710,193 @@ Snitt</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>gassbytte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>sikkerhetsstopp (frivillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>sikkerhetsstopp (obligatorisk)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>dypstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>tak (sikkerhetsstopp)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>dykketid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>under tak</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>maksdybde</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>lufttid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>retning</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>Advarsel: nivå i vev</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>tid uten stopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>ugyldig hendelsesnummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Kunne ikke lage parser for %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Feil ved registrering av data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Feil ved lesing av dato</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Dykk %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Feil ved lesing av dykketid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Feil ved lesing av maksdybde</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Klarte ikke å lese temperatur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Feil ved lesing av gassmiksantall</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Feil ved lesing av salthetsgrad</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Klarte ikke å hente overflatetrykk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Klarte ikke å lese dykkemodus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Feil ved lesing av gassmiks</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Feil ved lesing av detaljer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Hendelse: Venter på bruker</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Feil ved registrering av hendelseshåndterer.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Feil ved registrering av avbruddshåndterer.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Feil ved import av dykkedata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kunne ikke opprette kontekst for libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fikk ikke åpnet %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Har ikke tilgang til å åpne enhet %s %s (%s)</translation>
     </message>
@@ -8087,7 +8108,7 @@ Snitt</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8096,70 +8117,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8168,7 +8189,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8177,170 +8198,170 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Sikkerhetsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: ukjent tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>I deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>I deko (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (kalk.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Kalkulert tak %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Vev %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>puls: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>retning: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>snittdybde hit  %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8375,16 +8396,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 dykk)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 dykk)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>båt</translation>
@@ -8658,42 +8669,47 @@ EADD: %d%s
         <translation>mer enn %d dager</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dt %dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>for dykk #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>for valgte dykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>for dykk #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>for valgte dykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>for alle dykk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(ingen dykk)</translation>
     </message>
@@ -8793,7 +8809,7 @@ EADD: %d%s
         <translation>des</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index 9789e292d..0064c3657 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Persoon:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>zoekt naar buddies en divemasters</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Gebruik</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <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="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Fles kan niet verwijderd worden</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <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>
@@ -1899,104 +1899,6 @@ duikcomputer wilt verwijderen?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>Nr.</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Waardering</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Diepte (%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Duur</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temp (%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Gewicht (%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>US pond</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Pak</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Fles</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>Gasverbruik (%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Max CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Locatie</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2016,7 +1918,7 @@ duikcomputer wilt verwijderen?</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="855"/>
         <source>Remove dive(s) from trip</source>
-        <translation>duik(en) uit trip verwijderen</translation>
+        <translation>Duik(en) uit trip verwijderen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="856"/>
@@ -2026,7 +1928,7 @@ duikcomputer wilt verwijderen?</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="870"/>
         <source>Add dive(s) to trip immediately above</source>
-        <translation>duik(en) toevoegen aan de trip hierboven</translation>
+        <translation>Duik(en) toevoegen aan de trip hierboven</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="872"/>
@@ -2046,12 +1948,12 @@ duikcomputer wilt verwijderen?</translation>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="881"/>
         <source>Delete dive(s)</source>
-        <translation>duik(en) verwijderen</translation>
+        <translation>Duik(en) verwijderen</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="883"/>
         <source>Mark dive(s) invalid</source>
-        <translation>markeer duik(en) als ongeldig</translation>
+        <translation>Markeer duik(en) als ongeldig</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="887"/>
@@ -2097,12 +1999,12 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Maak een nieuwe duikstek, door relevante informatie van de huidige duikstek te kopiëren. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Nieuwe duikstek aanmaken onder deze naam</translation>
     </message>
@@ -2788,32 +2690,32 @@ duikcomputer wilt verwijderen?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Eind diepte</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Verbruikt Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC Instelpunt</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Waardering</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Gewicht (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Pak</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Fles</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>Gasverbruik (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Diepte (%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temp (%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3536,7 +3438,7 @@ Zend het volgende naar de ontwikkelaar.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Locatie:</translation>
     </message>
@@ -3662,7 +3564,7 @@ Zend het volgende naar de ontwikkelaar.
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Beheer duikstekken</translation>
     </message>
@@ -3684,7 +3586,7 @@ Zend het volgende naar de ontwikkelaar.
 Bent u zeker?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>U bent een duikstek aan het bewerken</translation>
     </message>
@@ -3994,6 +3896,26 @@ Bent u zeker?</translation>
         <translation>Voeg gewichtssysteem toe</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>Open Circuit</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation>Apneu</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Lucht temp. [%1]</translation>
@@ -4031,69 +3953,69 @@ Bent u zeker?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Diepste duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Ondiepste duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Hoogste SAC van een duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Laagste SAC van een duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Gemiddelde SAC van de geselecteerde duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Hoogste temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Laagste temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Gemiddelde temperatuur van de geselecteerde duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Langste duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Kortste duik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Gemiddelde duiktijd van de geselecteerde duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4102,22 +4024,22 @@ worden uit lucht en:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>en</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Nieuwe duikstek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Wijzigingen niet opslaan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>U staat op het punt wijzigingen te verwijderen</translation>
     </message>
@@ -4270,7 +4192,7 @@ worden uit lucht en:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Open</translation>
     </message>
@@ -4523,7 +4445,7 @@ worden uit lucht en:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>Ongedaan maken</translation>
     </message>
@@ -4536,7 +4458,7 @@ worden uit lucht en:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>Opnieuw</translation>
     </message>
@@ -4771,144 +4693,144 @@ worden uit lucht en:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Bestand openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Doorloop mappen met afbeeldingen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Scan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Scan afbeeldingen...(even geduld aub)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <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="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <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="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Runtime tabel afdrukken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>U probeert een duik aan te passen die niet handmatig is toegevoegd.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Wilt u de wijzigingen in bestand %1 bewaren?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Wilt u de wijzigingen bewaren in het bestand?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Aanpassingen opslaan?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Bestand bewaren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[cloud opslag voor] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Opent een datafile van een oudere versie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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 datafile 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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Open duiklogboek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Duik log bestanden (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Contact opnemen met cloud service...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <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="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <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="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <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="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Jaarlijkse statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <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>
@@ -4926,7 +4848,7 @@ Subsurface heeft reeds gesprobeerd de data te converteren, maar het is nuttig ze
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter toont %1 (van %2) duiken</translation>
     </message>
@@ -6044,12 +5966,12 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>AIR</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>ZUURSTOF</translation>
     </message>
@@ -6089,42 +6011,53 @@ Start Bluetooth op uw OSTC Sport en voer dezelfde voorbereidingen als voor een l
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation>(%1 duiken)</translation>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation>(1 duik)</translation>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6599,7 +6532,7 @@ Niet alle afbeeldingen hebben tijdstempels tussen 30 minuten voor de start en 30
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Duikpakken:</translation>
     </message>
@@ -6626,7 +6559,7 @@ Niet alle afbeeldingen hebben tijdstempels tussen 30 minuten voor de start en 30
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Trefwoorden:</translation>
     </message>
@@ -6820,17 +6753,10 @@ Niet alle afbeeldingen hebben tijdstempels tussen 30 minuten voor de start en 30
         <translation>color6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Wilt u de wijzigingen bewaren?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>U staat op het punt een sjabloon behorende bij Subsurface te bewerken.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6914,10 +6840,105 @@ Niet alle afbeeldingen hebben tijdstempels tussen 30 minuten voor de start en 30
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <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="194"/>
+        <source>#</source>
+        <translation>Nr.</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Waardering</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Diepte (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Duur</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temp (%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Gewicht (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>US pond</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Pak</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Fles</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>Gasverbruik (%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Max CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Locatie</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7015,8 +7036,8 @@ Niet alle afbeeldingen hebben tijdstempels tussen 30 minuten voor de start en 30
         <translation>Handleiding</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>De handleiding kan niet gevonden worden</translation>
     </message>
@@ -7431,7 +7452,7 @@ Maximum</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Fout bij het verwerken van de header</translation>
     </message>
@@ -7510,7 +7531,7 @@ Maximum</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) of (%s)</translation>
     </message>
@@ -7614,7 +7635,7 @@ Maximum</translation>
         <translation>Geen duikcomputer gevonden voor bestand &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>geen</translation>
     </message>
@@ -7622,7 +7643,7 @@ Maximum</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>decompressiestop</translation>
     </message>
@@ -7635,7 +7656,7 @@ Maximum</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>RBT</translation>
     </message>
@@ -7643,45 +7664,45 @@ Maximum</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>opstijging</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>plafond</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>werklast</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>zender</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>schending</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>bladwijzer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>oppervlakte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>veiligheidsstop</translation>
     </message>
@@ -7690,193 +7711,193 @@ Maximum</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>gaswissel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>veiligheidsstop (vrijwillig)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>veiligheidsstop (verplicht)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>diepe stop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>plafond (veiligheidsstop)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>duiktijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <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="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>Max. diepte</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>resterende luchttijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>RGBM</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>koers</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>waarschuwing stikstofbelasting</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>nultijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>ongeldig event-nummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Kan geen parser creëren voor %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Fout bij het registreren van de data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Fout bij verwerken van de datum en tijd</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Duik nr. %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Fout bij verwerken van de duikduur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Fout bij het verwerken van de maximum duikdiepte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Fout bij het verwerken van de temperatuur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Fout bij het verwerken van het aantal gasmengsels</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Fout bij het verkrijgen van het zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Fout bij bekomen van oppervlaktedruk</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Fout bij bepalen duikmodus</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Fout bij het verwerken van het gasmengsel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Fout bij het verwerken van de samples</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Event: wachten op handeling van gebruiker</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Fout bij het registreren van de event handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Fout bij het registreren van de cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Fout bij importeren van duikdata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan geen context creëren voor libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Fout bij openen van  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Privileges ontoereikend voor toegang tot het toestel %s %s (%s)</translation>
     </message>
@@ -8088,7 +8109,7 @@ Maximum</translation>
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8097,70 +8118,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN₂%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8169,7 +8190,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8178,170 +8199,170 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Veiligheidsstop: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Veiligheidsstop: onbek tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: onbek tijd @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>In deco (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (berekend)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Berekend plafond %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Compartiment %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>hartslag: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>koers: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>gemiddelde diepte tot nu toe %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8376,16 +8397,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 duiken)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 duik)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>boot</translation>
@@ -8659,42 +8670,47 @@ EADD: %d%s
         <translation>meer dan %d dagen</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %du %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation>%dmin %dsecs</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%du %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>voor duik nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>voor de geselecteerde duiken</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>Voor duik nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>voor de geselecteerde duik</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>voor alle duiken</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(geen duiken)</translation>
     </message>
@@ -8794,7 +8810,7 @@ EADD: %d%s
         <translation>dec</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index 251bc5524..27045a0c4 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Osoba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Wyszukiwanie partnerów i divemasterów</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Użycie</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Kliknięcie tu usunie butlę z listy.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Butla nie może być usunięta.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Ten gaz jest używany. Można usuwać tylko gazy, których nie używasz.</translation>
     </message>
@@ -1899,104 +1899,6 @@ wybrany komputer nurkowy?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>Nr</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Ocena</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Głębokość(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Czas trwania</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temperatura(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Balast(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Skafander</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Butle</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gaz</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Max CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Miejsce</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Utwórz nowe miejsce nurkowe, skopiuj istotne informacje z bieżącego nurkowania.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Utwórz nowe miejsce nurkowe z tą nazwą</translation>
     </message>
@@ -2788,32 +2690,32 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Głębokość końcowa</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Używany gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>Nr</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Balast(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Głębokość(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatura(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3535,7 +3437,7 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Miejsce:</translation>
     </message>
@@ -3661,7 +3563,7 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Zarządzanie miejscami nurkowymi</translation>
     </message>
@@ -3683,7 +3585,7 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
 Czy na pewno kontynuować?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Edytujesz miejsce nurkowania</translation>
     </message>
@@ -3994,6 +3896,26 @@ Czy na pewno kontynuować?</translation>
         <translation>Dodaj balast</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. powietrza [%1]</translation>
@@ -4031,69 +3953,69 @@ Czy na pewno kontynuować?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Najgłębsze nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Najpłytsze nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Najwyższy SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Najniższy SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Średni SAC z wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Najwyższa temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Najniższa temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Średnia temperatura z wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Najdłuższe nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Najkrótsze nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Średnia długość wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4102,22 +4024,22 @@ z powietrza przy użyciu:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>oraz </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Nowe miejsce nurkowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Porzucić zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Masz zamiar porzucić zmiany.</translation>
     </message>
@@ -4270,7 +4192,7 @@ z powietrza przy użyciu:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
@@ -4523,7 +4445,7 @@ z powietrza przy użyciu:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>Cofnij</translation>
     </message>
@@ -4536,7 +4458,7 @@ z powietrza przy użyciu:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>Ponów</translation>
     </message>
@@ -4771,144 +4693,144 @@ z powietrza przy użyciu:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Katalogi zdjęć do przejrzenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Skanuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Skanowanie zdjeć... (to chwilę potrwa)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed zamknięciem pliku.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed dodaniem nowego.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Drukowanie planu nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Próba edycji nurkowania, które nie zostało dodane ręcznie.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Czy chcesz zapisać zmiany dokonane w pliku %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Czy chcesz zapisać wprowadzone zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Zapisać zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Zapisz plik jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[zapis w chmurze dla] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Otwarto plik ze starszej wersji</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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>Otworzony plik pochodzi ze starszej wersji Subsurface. Zalecamy zapoznać się z instrukcją i opisanymi tam zmianami w najnowszej wersji programu, szczególnie z nowym sposobem zarządzania miejscami nurkowymi.
 Subsurface zaimportował informacje o miejscach nurkowych, ale może warto poświęcić chwilę na przejrzenia tych danych i upewnienie się, że wszytko wygląda poprawnie.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Otwórz plik z logiem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Logi nurkowe (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Pliki Cochran (*.can *.CAN);;Pliki CSV (*.csv *.CSV);;Pliki DiveLog.de (*.dld *.DLD);;Pliki JDiveLog (*.jlb *.JLB);;Pliki Liquivision (*.lvd *.LVD);;Pliki MkVI (*.txt *.TXT);;Pliki Suunto (*.sde *.db *.SDE *.DB);;Pliki Divesoft (*.dlf *.DLF);;Pliki UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Pliki XML (*.xml *.XML);;Pliki APD (*.apd *.APD);;Pliki Datatrak/WLog (*.log *.LOG);;Pliki OSTCtools (*.dive *.DIVE);;Wszystkie pliki(*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Łączenie się z chmurą...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Zmiany zostaną utracone jeśli ich nie za zapiszesz.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Zapisz zmiany lub anuluj to nurkowanie przez otwarciem nowego pliku.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Próba zmiany planu nurkowania, które nie zostało utworzone przez planer.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Statystyka roczna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Pliki Subsurface XML  (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Proszę dokończyć edycję tego nurkowania przed rozpoczęciem kolejnej. </translation>
     </message>
@@ -4926,7 +4848,7 @@ Subsurface zaimportował informacje o miejscach nurkowych, ale może warto pośw
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filtr pokazuje %1 (z %2) nurkowań</translation>
     </message>
@@ -6044,12 +5966,12 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>POWIETRZE</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>TLEN</translation>
     </message>
@@ -6089,42 +6011,53 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6600,7 +6533,7 @@ Nie wszystkie zdjęcia mają czas w zakresie pomiędzy
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Skafandry:</translation>
     </message>
@@ -6627,7 +6560,7 @@ Nie wszystkie zdjęcia mają czas w zakresie pomiędzy
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Tagi:</translation>
     </message>
@@ -6821,17 +6754,10 @@ Nie wszystkie zdjęcia mają czas w zakresie pomiędzy
         <translation>kolor6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Czy zapisać zmiany?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>Masz zamiar zmodyfikować szablon dostarczony przez Subsurface.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6915,10 +6841,105 @@ Nie wszystkie zdjęcia mają czas w zakresie pomiędzy
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation> (%1 pokazane)</translation>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>Nr</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Ocena</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Głębokość(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Czas trwania</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temperatura(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Balast(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Skafander</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Butle</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gaz</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Max CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Miejsce</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7016,8 +7037,8 @@ Nie wszystkie zdjęcia mają czas w zakresie pomiędzy
         <translation>Instrukcja obsługi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Nie można znaleźć dokumentacji Subsurface</translation>
     </message>
@@ -7427,7 +7448,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Błąd podczas przetwarzania nagłówka</translation>
     </message>
@@ -7506,7 +7527,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) lub (%s)</translation>
     </message>
@@ -7610,7 +7631,7 @@ Maximum</source>
         <translation>Nie znaleziono komputera nurkowego pasującego do pliku &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>brak</translation>
     </message>
@@ -7618,7 +7639,7 @@ Maximum</source>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>przystanek deco</translation>
     </message>
@@ -7631,7 +7652,7 @@ Maximum</source>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>pozostały czas denny</translation>
     </message>
@@ -7639,45 +7660,45 @@ Maximum</source>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>wynurzanie</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>sufit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>wysiłek</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>nadajnik</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>naruszenie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>notatka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>powierzchnia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>przystanek bezpieczeństwa</translation>
     </message>
@@ -7686,193 +7707,193 @@ Maximum</source>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>zmiana gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>przystanek bezpieczeństwa (opcjonalny)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>przystanek bezpieczeństwa (obowiązkowy)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>sufit (przystanek bezpieczeństwa)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>poniżej podłogi deco</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>Max głębokość</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>Pozostały czas oddychania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>kierunek</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>Ostrzeżenie: poziom nasycenia tkanek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>czas bezdekompresyjny</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>niepoprawny znacznik</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Nie udało się utworzyć parsera dla %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Błąd podczas przetwarzania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Błąd podczas przetwarzania daty i czasu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Nurkowanie %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Błąd podczas przetwarzania czasu nurkowania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Błąd podczas przetwarzania głębokości</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Błąd przy przetwarzaniu temperatury</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Błąd podczas przetwarzania danych o ilości użytych rodzajów gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Błąd podczas przetwarzania danych o zasoleniu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Błąd podczas przetwarzania danych o cienieniu atmosferycznym</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Błąd odczytywania trybu pracy komputera nurkowego </translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Błąd podczas przetwarzania danych o użytym rodzaju gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Błąd podczas przetwarzania próbek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Oczekiwanie na działanie użytkownika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), numer seryjny=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Błąd rejestracji uchwytu (event handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Błąd rejestracji uchwytu (cancellation handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Błąd podczas importowania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nie udało się otworzyć %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Brak uprawnień by otworzyć urządzenie %s %s (%s)</translation>
     </message>
@@ -8084,7 +8105,7 @@ Maximum</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8093,70 +8114,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8165,7 +8186,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8174,35 +8195,35 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Przystanek bezp.: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Przystanek bezp.: nieznany czas @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: nieznany czas @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>dekompresja
@@ -8210,135 +8231,135 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (obliczone)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>dekompresja (obliczone)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Obliczony sufit:  %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tkanka %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>tętno: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>kurs: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>gł. średnia do teraz %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sGł:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sGł:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8373,16 +8394,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 dives)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 nurkowanie)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>z łodzi</translation>
@@ -8656,42 +8667,47 @@ EADD: %d%s
         <translation>więcej niż %d dni</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>dla nurkowania nr</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>dla wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>dla nurkowania #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>dla wybranego nurkowania</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>dla wszystkich nurkowań</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(brak nurkowań)</translation>
     </message>
@@ -8791,7 +8807,7 @@ EADD: %d%s
         <translation>Gru</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts
index 2275308fb..a5a12fbcc 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -1714,17 +1714,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Ao clicar aqui irá eliminar este cilindro.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Cilindro não pode ser eliminado</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Esse gás está em uso, Apenas cilindros que não estão sendo usados podem ser removidos.</translation>
     </message>
@@ -1897,104 +1897,6 @@ o computador de mergulho selecionado?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>nº</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Classificação</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>pé(s)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Roupa</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Cilindro</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gás</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>CNS Máximo</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Local</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2095,12 +1997,12 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation type="unfinished"/>
     </message>
@@ -2786,32 +2688,32 @@ o computador de mergulho selecionado?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Gás usado</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3016,127 +2918,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>nº</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Roupa</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Cilindro</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gás</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>CNS Máximo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3527,7 +3429,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3653,7 +3555,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation type="unfinished"/>
     </message>
@@ -3674,7 +3576,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -3984,6 +3886,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Temperatura do Ar [%1]</translation>
@@ -4021,69 +3943,69 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Mergulho mais profundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Mergulho mais raso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4092,22 +4014,22 @@ misturados com ar usando:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Descartar alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Você está prestes a eliminar suas alterações.</translation>
     </message>
@@ -4260,7 +4182,7 @@ misturados com ar usando:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
@@ -4513,7 +4435,7 @@ misturados com ar usando:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
@@ -4526,7 +4448,7 @@ misturados com ar usando:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
@@ -4761,143 +4683,143 @@ misturados com ar usando:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Por favor, salve ou cancele a edição atual do mergulho antes de fechar o arquivo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Por favor, salve ou cancele a edição atual do mergulho atual antes de tentar adicionar um mergulho.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Imprimir tabela</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Você quer salvar as alterações que fez no arquivo %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Você quer salvar as alterações feitas no arquivo?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Salvar Alteraḉões?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Salvar arquivo como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Abrir arquivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <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="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Por favor, salve ou cancele a edição atual do mergulho antes de abrir um novo arquivo.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Estatisticas Anuais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Primeiro termine a edição atual antes de editar outro.</translation>
     </message>
@@ -4915,7 +4837,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -6031,12 +5953,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>AR</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
@@ -6076,42 +5998,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>pé(s)</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>pés cúbicos</translation>
     </message>
@@ -6579,7 +6512,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -6606,7 +6539,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -6800,16 +6733,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6893,10 +6820,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>nº</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>pé(s)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Roupa</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Cilindro</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gás</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>CNS Máximo</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Local</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -6994,8 +7016,8 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Não foi possível encontrar o manual do Subsurface</translation>
     </message>
@@ -7407,7 +7429,7 @@ Médio</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7486,7 +7508,7 @@ Médio</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
@@ -7590,7 +7612,7 @@ Médio</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>nenhum</translation>
     </message>
@@ -7598,7 +7620,7 @@ Médio</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>parada de deco</translation>
     </message>
@@ -7611,7 +7633,7 @@ Médio</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7619,45 +7641,45 @@ Médio</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>subida</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>teto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>nível de esforço</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>transmissor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>violação</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>favorito</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>superfície</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>parada de segurança</translation>
     </message>
@@ -7666,193 +7688,193 @@ Médio</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>troca de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>parada de segurança (voluntária)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>parada de segurança (obrigatória)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>parada profunda</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>teto (parada de segurança)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <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="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>prof máx</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>tempo de ar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>direção</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>Alarme do nível nos tecidos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>tempo sem parada</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>número de evento inválido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Não é possivel criar o analisador para %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Erro no registo dos dados</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Erro na análise da data/horário</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Mergulho nº %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Erro na análise da duração do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Erro na análise da profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Erro na análise da contagem de misturas de gases</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erro na obtenção da pressão na superfície</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Erro na análise da mistura de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: aguardando ação do usuário</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Erro no registo do rótulo do evento.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erro no registo do rótulo de cancelamento.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Erro ao importar os dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto da libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Não se consegue abrir  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -8064,7 +8086,7 @@ Médio</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8073,70 +8095,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8145,7 +8167,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8154,164 +8176,164 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Parada de segurança:  %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Parada de segurança: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>Em deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>Em deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Teto calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tecido %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>Cardio: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8346,16 +8368,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 mergulhos)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 mergulho)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>barco</translation>
@@ -8629,42 +8641,47 @@ EADD: %d%s
         <translation>mais que %d dias</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>para mergulhos nº</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>para mergulhos selecionados</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>para mergulho nº %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>para mergulho selecionado</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>para todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(nenhum mergulho)</translation>
     </message>
@@ -8764,7 +8781,7 @@ EADD: %d%s
         <translation>Dez</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts
index a63dc675a..4918616f9 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Companheiro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Busca por companheiros e guias de mergulho</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Utilização</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <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="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>A garrafa não pode ser eliminada</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <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>
@@ -1899,104 +1899,6 @@ remover o computador de mergulho seleccionado?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Classificação</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Profundidade(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>pé</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Duração</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temperatura(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Peso(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>libra</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Fato</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Garrafa</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gás</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>CNS Máx</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Local</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/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="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/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>
@@ -2788,32 +2690,32 @@ remover o computador de mergulho seleccionado?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Profundidade final</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Gás usado</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>Setpoint CF</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Classificação</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>pés</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Peso(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Fato</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gás</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>CNS Máx</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Profundidade(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatura(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>libras</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3536,7 +3438,7 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Local:</translation>
     </message>
@@ -3662,7 +3564,7 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Gestão de locais de mergulho</translation>
     </message>
@@ -3684,7 +3586,7 @@ por favor envie a seguinte informação aos desenvolvedores do Subsurface.
 Tem a certeza que quer continuar?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Está a editar um local de mergulho</translation>
     </message>
@@ -3994,6 +3896,26 @@ Tem a certeza que quer continuar?</translation>
         <translation>Adicionar sistema de lastro</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>CA</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation>Apneia</translation>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. do ar [%1]</translation>
@@ -4031,69 +3953,69 @@ Tem a certeza que quer continuar?</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Mergulho mais fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Mergulho menos fundo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Consumo mais elevado num mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Consumo mais baixo num mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Média do consumo para os mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Temperatura mais elevada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Temperatura mais baixa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Média da temperatura nos mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Mergulho mais longo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Mergulho mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Duração média para os mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4102,22 +4024,22 @@ obtidos a partir do ar usando:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Novo local de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Eliminar as alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Está prestes a eliminar as alterações.</translation>
     </message>
@@ -4270,7 +4192,7 @@ obtidos a partir do ar usando:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
@@ -4523,7 +4445,7 @@ obtidos a partir do ar usando:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>&amp;Reverter</translation>
     </message>
@@ -4536,7 +4458,7 @@ obtidos a partir do ar usando:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>&amp;Refazer</translation>
     </message>
@@ -4771,144 +4693,144 @@ obtidos a partir do ar usando:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Abrir Ficheiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Atravessar as pastas das imagens</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Procurar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>A procurar imagens... (pode demorar um pouco)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <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="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <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="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Imprimir tabela de runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>A tentar editar um mergulho que não foi criado manualmente.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <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="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <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="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Guardar alterações?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Guardar ficheiro como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[armazenamento remoto para] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>A abrir ficheiro de uma versão mais antiga</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Abrir ficheiro de registo de mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Ficheiros de logbook (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Ficheiros Cochran (*.can *.CAN);;CSV files (*.csv *.CSV);;Ficheiros DiveLog.de (*.dld *.DLD);;Ficheiros JDiveLog (*.jlb *.JLB);;Ficheiros Liquivision (*.lvd *.LVD);;Ficheiros MkVI (*.txt *.TXT);;Ficheiros Suunto (*.sde *.db *.SDE *.DB);;Ficheiros Divesoft (*.dlf *.DLF);;Ficheiros UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Ficheiros XML (*.xml *.XML);;Ficheiros APD log viewer (*.apd *.APD);;Ficheiros Datatrak/WLog (*.log *.LOG);;Ficheiros OSTCtools (*.dive *.DIVE);;Todos os ficheiros (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>A contactar o serviço remoto...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <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="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <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="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <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="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Estatísticas anuais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <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>
@@ -4926,7 +4848,7 @@ O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sis
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>O filtro mostra %1 (de %2) mergulhos</translation>
     </message>
@@ -6044,12 +5966,12 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>Ar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>OXIGÉNIO</translation>
     </message>
@@ -6089,42 +6011,53 @@ Por favor inicie o Bluetooth no seu OSTC Sport e siga o mesmo procedimento que p
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation>(%1 mergulhos)</translation>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation>(1 mergulho)</translation>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>libra</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>pé</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>pé cúbico</translation>
     </message>
@@ -6600,7 +6533,7 @@ Nem todas as imagens foram obtidas no entervalo entre
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Fatos:</translation>
     </message>
@@ -6627,7 +6560,7 @@ Nem todas as imagens foram obtidas no entervalo entre
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Etiquetas:</translation>
     </message>
@@ -6821,17 +6754,10 @@ Nem todas as imagens foram obtidas no entervalo entre
         <translation>cor6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Deseja gravar as alterações?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>Está prestes a modificar um dos templates fornecidos com o Subsurface.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6915,10 +6841,105 @@ Nem todas as imagens foram obtidas no entervalo entre
 <context>
     <name>TripItem</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="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Classificação</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Profundidade(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>pé</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Duração</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temperatura(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Peso(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>libra</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Fato</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Garrafa</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gás</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>CNS Máx</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Local</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7016,8 +7037,8 @@ Nem todas as imagens foram obtidas no entervalo entre
         <translation>Manual do utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Não foi possível encontrar o manual do Subsurface</translation>
     </message>
@@ -7432,7 +7453,7 @@ Média</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Erro ao analisar o cabeçalho</translation>
     </message>
@@ -7511,7 +7532,7 @@ Média</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) ou (%s)</translation>
     </message>
@@ -7615,7 +7636,7 @@ Média</translation>
         <translation>Não foi possível encontrar um computador de mergulho correspondente ao ficheiro &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>nenhum</translation>
     </message>
@@ -7623,7 +7644,7 @@ Média</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>paragem de deco</translation>
     </message>
@@ -7636,7 +7657,7 @@ Média</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7644,45 +7665,45 @@ Média</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>subida</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>tecto</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>esforço</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>transmissor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>transgressão</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>marcador</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>superfície</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>paragem de segurança</translation>
     </message>
@@ -7691,193 +7712,193 @@ Média</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>troca de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>paragem de segurança (voluntária)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>paragem de segurança (obrigatória)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>paragem funda</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>tecto (paragem de segurança)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <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="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>Profundidade máxima</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>autonomia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>cabeçalho</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>Alarme de tensão de azoto nos tecidos</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>tempo sem paragem</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>Número de evento inválido</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <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="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Erro no registo de dados</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Erro na análise da data/tempo</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Mergulho nº %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Erro na análise do tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Erro na análise da profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Erro ao analisar tempetaturas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <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="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Erro na obtenção da salinidade da água</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Erro na obtenção da pressão atmosférica</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Erro na obtenção do modo de mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Erro na análise da mistura de gás</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Erro na análise das amostras</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: à espera de acção do utilizador</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Erro no registo do &quot;event handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Erro no registo do &quot;cancellation handler&quot;.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Erro a importar os dados do mergulho</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Não é possivel criar contexto do libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Não se consegue abrir  %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Não possui previlégios suficientes para abrir o dispositivo %s %s (%s)</translation>
     </message>
@@ -8089,7 +8110,7 @@ Média</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8098,70 +8119,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8170,7 +8191,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8179,170 +8200,170 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Paragem de segurança: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Paragem de segurança: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Descompressão: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Descompressão: tempo desconhecido @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>Em descompressão
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Descompressão:  %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>Em descompressão (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Tecto calculado %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Compartimento %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>frequência cardíaca: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>enfiamento: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>profundidade média até aqui %.1f%f
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8377,16 +8398,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 mergulhos)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 mergulho)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>barco</translation>
@@ -8660,42 +8671,47 @@ EADD: %d%s
         <translation>mais de %d dias</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd, %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation>%dmin %dseg</translation>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>para mergulhos #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>para mergulhos seleccionados</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>para mergulho #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>para o mergulho seleccionado</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>para todos os mergulhos</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(nenhum mergulho)</translation>
     </message>
@@ -8795,7 +8811,7 @@ EADD: %d%s
         <translation>Dez</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts
index 7a58ce45e..5cdab39da 100644
--- a/translations/subsurface_ro_RO.ts
+++ b/translations/subsurface_ro_RO.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Persoană: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Căutare de însoțitori și experți în scufundări</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Folosește</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Făcând click aici veți înlătura acest tub.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Tubul nu poate fi înlăturat</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Acest tub de gaz incă se folosește. Doar tuburile ce nu sunt folosite în scufundare pot fi șterse.</translation>
     </message>
@@ -1899,104 +1899,6 @@ computerul de scufundări selectat?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Dată</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Rating</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Adâncime(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>picioare</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Durată</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temperatură(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Greutate(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>livre</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Costum</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Tub</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gaz</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Max CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Locație</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Crearea unei noi locații de scufundare prin copierea informațiilor relevante din cea curentă.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Crearea unei noi locații de scufundare cu numele curent</translation>
     </message>
@@ -2788,32 +2690,32 @@ computerul de scufundări selectat?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Adâncime finală</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Timp de rulare</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Gaz folosit</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>Valorare CC de refetință</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Dată</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Rating</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temperatură</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Greutate</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Greutate(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Costum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Tub</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>CNS maxim</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Locație</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Adâncime(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatură(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3535,7 +3437,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Locație: </translation>
     </message>
@@ -3661,7 +3563,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Administrarea locației pentru scufundare</translation>
     </message>
@@ -3683,7 +3585,7 @@ p, li { white-space: pre-wrap; }
  Sigur doriți să continuați?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Sunteți in modul de editare a locației de scufundare</translation>
     </message>
@@ -3993,6 +3895,26 @@ p, li { white-space: pre-wrap; }
         <translation>Adaugă sistem de greutate</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Temperatura aerului [%1]</translation>
@@ -4030,69 +3952,69 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Scufundarea la cea mai mare adâncime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Scufundarea la cea mai mică adâncime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Cel mai mare total SAC al scufundării</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Cel mai mic SAC al scufundării</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Media totalului SAC din scufundările selectate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Cea mai mare temperatură</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Cea mai mică temperatură</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Temperatura medie a scufudărilor selectate</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Cea mai lungă scufundare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Cea mai scurtă scufundare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Durata medie a tuturor scufundărilor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4100,22 +4022,22 @@ mixed from Air and using:
 mixate cu aer și folosite:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation> și </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Locație de scufundare nouă</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Renunțați la modificări?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Sunteți pe cale să renunțați la modificări.</translation>
     </message>
@@ -4268,7 +4190,7 @@ mixate cu aer și folosite:</translation>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Deschide</translation>
     </message>
@@ -4521,7 +4443,7 @@ mixate cu aer și folosite:</translation>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>&amp;Anulează</translation>
     </message>
@@ -4534,7 +4456,7 @@ mixate cu aer și folosite:</translation>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>&amp;Refă</translation>
     </message>
@@ -4769,143 +4691,143 @@ mixate cu aer și folosite:</translation>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Deschideți fișier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Anulează</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Scanare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a închide fișierul.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a încerca să adăugați o scufundare.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Printați tabelul de execuție</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Doriți să salvați modificările efectuare în fișierul %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Doriți să salvați modificările efectuare în fișierul de date?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Doriți să salvați modificările?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Salvează ca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Deschideți înregistrările scufundărilor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Modificările vor fi pierdute dacă nu le salvați.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Avertizare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a deschide un nou fișier.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Statistici anuale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Vă rugăm să terminați editarea curentă înainte de a începe una nouă.</translation>
     </message>
@@ -4923,7 +4845,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filtrele afișează %1 (din %2) scufundări</translation>
     </message>
@@ -6041,12 +5963,12 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>AER</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>OXIGEN</translation>
     </message>
@@ -6086,42 +6008,53 @@ Vă rugăm să porniți Bluetooth-ul pe dispozitivul OSTC Sport și urmați acei
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>livre</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>picioare</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>livre pe inch pătrat</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>picioare cubice</translation>
     </message>
@@ -6595,7 +6528,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Costume:</translation>
     </message>
@@ -6622,7 +6555,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Etichete: </translation>
     </message>
@@ -6816,16 +6749,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6909,10 +6836,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Dată</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Rating</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Adâncime(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>picioare</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Durată</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temperatură(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Greutate(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>livre</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Costum</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Tub</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gaz</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>CNS maxim</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Locație</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7010,8 +7032,8 @@ Not all images have timestamps in the range between
         <translation>Manual de utilizare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Nu s-a putut găsi manualul pentru Subsurface</translation>
     </message>
@@ -7426,7 +7448,7 @@ Medie</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7505,7 +7527,7 @@ Medie</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) sau (%s)</translation>
     </message>
@@ -7609,7 +7631,7 @@ Medie</translation>
         <translation>Nu s-a putut găsi niciun calculator de scufundări pentru fișierul &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>niciunul</translation>
     </message>
@@ -7617,7 +7639,7 @@ Medie</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>oprire de decompresie</translation>
     </message>
@@ -7630,7 +7652,7 @@ Medie</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7638,45 +7660,45 @@ Medie</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>ascensiune</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>plafon</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>volum de muncă</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>transmițător</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>încălcare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>semn de carte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>suprafață</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>oprire pentru siguranță</translation>
     </message>
@@ -7685,193 +7707,193 @@ Medie</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>schimbarea gazului</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>oprire pentru siguranță (voluntară)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>oprire pentru siguranță (obligatorie)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>plafon (oprire pentru siguranță)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>timp scufundare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>sub limită</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>adâncime maximă</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>timp aer rămas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>direcție</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>avertizare nivel țesut</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>timp fără oprire</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>numărul evenimentul este invalid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Nu s-a putut crea parser pentru %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Eroare înregistrând datele</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Eroare parsând data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Scufundarea %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Eroare parsând data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Eroare parsând adâncimea maximă</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Eroare parsând temperatura</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Eroare parsând valoarea amestecului de gaz</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Eroare obținând salinitatea apei</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Eroare obținând presiunea la suprafață</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Eroare la obținerea modului de scufundare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Eroare parsând amestecul de gaz</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Eroare parsând eșantioanele</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Eveniment: aștept acțiunea utilizatorului</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Eroare la înregistrarea handlerului de evenimente.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Eroare la înregistrarea handlerului de anulare.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Eroare la importarea datelor despre scufundare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nu s-a putut crea contextul libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nu s-a putut deschide %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Nu aveți drepturi suficiente pentru a deschide dispozitivul %s %s (%s)</translation>
     </message>
@@ -8082,7 +8104,7 @@ Medie</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8091,70 +8113,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8163,7 +8185,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8172,167 +8194,167 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Oprire de siguranță: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Oprire de siguranță: timp necunoscut @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Decompresie: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Decompresie: timp necunoscut @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>În decompresie
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Decompresie: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>În decompresie (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Limita calculată %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Țesut %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>puls: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>producere: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>adâncimea medie pana aici %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8367,16 +8389,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 scufundări)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 scufundare)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>ambarcațiune</translation>
@@ -8650,42 +8662,47 @@ EADD: %d%s
         <translation>mai mult de %d zile</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dz %do %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%do %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>pentru scufundările nr.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>pentru scufundările selectate</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>pentru scufundarea nr. %d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>pentru scufundarea selectată</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>pentru toate scufundările</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(nicio scufundare)</translation>
     </message>
@@ -8785,7 +8802,7 @@ EADD: %d%s
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index b67cd5e4b..9d77a3cfa 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Люди:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Поиск партнеров и инструкторов</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Назначение</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Нажмите здесь чтобы удалить этот баллон.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Баллон не может быть удален</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation>
     </message>
@@ -1899,104 +1899,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>№</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Дата</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Оценка</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Глубина(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>м</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>фут</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Длительность</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Температура(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Вес(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>кг</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>фунт</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Костюм</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Баллон</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Смесь</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/мин</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Макс. CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Местонахождение</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Создать новый дайв-сайт, заполнив данными из текущего погружения.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Создать дайв-сайт с этим наванием</translation>
     </message>
@@ -2788,32 +2690,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Отсчет</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Исп. газ</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>Установка ребризера</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Темп.</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Вес</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Вес(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Костюм</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Баллон</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Смесь</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/мин</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Макс. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Глубина(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Температура(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3536,7 +3438,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Места:</translation>
     </message>
@@ -3662,7 +3564,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Управление дайв-сайтами</translation>
     </message>
@@ -3684,7 +3586,7 @@ p, li { white-space: pre-wrap; }
 Вы желаете продолжить?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Редактирование дайв-сайта</translation>
     </message>
@@ -3994,6 +3896,26 @@ p, li { white-space: pre-wrap; }
         <translation>Добавить грузовую систему</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>Откр. цикл</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Темп. воздуха [%1]</translation>
@@ -4031,69 +3953,69 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Наибольший SAC за погружение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Наименьший SAC за погружение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Общий средний SAC выбранных погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Наивысшая температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Наименьшая температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Средняя температура выбранных погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Максимальное время погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Минимальное время погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Средня длительность выбранных погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4102,22 +4024,22 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation> и </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Новый дайв-сайт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Отменить изменения?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Вы собираетесь отменить свои изменения.</translation>
     </message>
@@ -4270,7 +4192,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
@@ -4523,7 +4445,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>Отменить</translation>
     </message>
@@ -4536,7 +4458,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>Повторить</translation>
     </message>
@@ -4771,144 +4693,144 @@ mixed from Air and using:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Открыть журнал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Сканировать директории с фото</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Сканировать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Поиск изображений, подождите...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Сохраните или отмените изменения перед закрытием файла.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Сохраните или отмените изменения перед добавлением погружения.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Печать плана погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Попытка редактирования погружения, созданного не вручную.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Хотите ли вы сохранить изменения, внесенные в файл %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Хотите ли вы сохранить изменения, внесенные в файл журнала?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Сохранить изменения?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[облачное хранилище для] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Журнал создан в старой версии</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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>Вы открыли журнал, созданный в старой версии Subsurface. Мы рекомендуем прочитать руководство, чтобы узнать о последних изменения, особенно что касается управления сайтами погружений.
 Subsurface попытался перенести уже существующие данные, но тем не менее стоит проверить, что все информация выглядит корректно.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Открыть журнал погружений</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Файлы журналов (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Файлы Cochran (*.can *.CAN);;Файлы CSV (*.csv *.CSV);;Файлы DiveLog.de (*.dld *.DLD);;Файлы JDiveLog (*.jlb *.JLB);;Файлы Liquivision (*.lvd *.LVD);;Файлы MkVI (*.txt *.TXT);;Файлы Suunto (*.sde *.db *.SDE *.DB);;Файлы Divesoft (*.dlf *.DLF);;Файлы UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Файлы XML (*.xml *.XML);;APD log viewer (*.apd *.APD);;Файлы Datatrak/WLog (*.log *.LOG);;Файлы OSTCtools (*.dive *.DIVE);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Соединение с облачным сервисом...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Изменения будут утеряны, если вы не сохраните их.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Сохраните или отмените изменения перед открытием нового файла.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Статистика по годам</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation>
     </message>
@@ -4926,7 +4848,7 @@ Subsurface попытался перенести уже существующие
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Показано %1 (из %2) погружений</translation>
     </message>
@@ -6044,12 +5966,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>воздух</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>КИСЛОРОД</translation>
     </message>
@@ -6089,42 +6011,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>бар</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>куб. фут</translation>
     </message>
@@ -6600,7 +6533,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Костюмы:</translation>
     </message>
@@ -6627,7 +6560,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Метки:</translation>
     </message>
@@ -6821,17 +6754,10 @@ Not all images have timestamps in the range between
         <translation>color6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Сохранить изменения?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>Вы собираетесь изменить шаблон из штатной поставки Subsurface.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6915,10 +6841,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation> (показано %1)</translation>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>№</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Оценка</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Глубина(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>м</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>фут</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Длительность</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Температура(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Вес(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>кг</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>фунт</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Костюм</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Баллон</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Смесь</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/мин</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Макс. CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Местонахождение</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7016,8 +7037,8 @@ Not all images have timestamps in the range between
         <translation>Руководство пользователя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Руководство не найдено</translation>
     </message>
@@ -7432,7 +7453,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Ошибка разбора заголовка</translation>
     </message>
@@ -7511,7 +7532,7 @@ Maximum</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
@@ -7615,7 +7636,7 @@ Maximum</source>
         <translation>Не найден соответствующий компьютер для файла &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>отсутствует</translation>
     </message>
@@ -7623,7 +7644,7 @@ Maximum</source>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>деко стоп</translation>
     </message>
@@ -7636,7 +7657,7 @@ Maximum</source>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>оставшееся время на дне</translation>
     </message>
@@ -7644,45 +7665,45 @@ Maximum</source>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>подъем</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>потолок</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>нагрузка</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>передатчик</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>нарушение</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>закладка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>поверхность</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>остановка безопасности</translation>
     </message>
@@ -7691,193 +7712,193 @@ Maximum</source>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>замена смеси</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>остановка безопасности (добровольно)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>остановка безопасности (обязательно)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>глубокая остановка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>потолок (остановка безопасности)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>время погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>ниже пола</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>макс. глуб.</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>оставшееся время по воздуху</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>направление</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>насыщение тканей</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>время без остановки</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>неверный номер события</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Невозможно создать анализатор для %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Ошибка регистрации данных</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Ошибка разбора даты/времени</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Погр. №%d - %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Ошибка разбора времени погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Ошибка разбора макс. глубины</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Ошибка разбора температуры</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Ошибка разбора счетчика смесей</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Ошибка получения солености воды</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Ошибка получения давления на поверхности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Ошибка при получении режима погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Ошибка разбора смеси</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Ошибка разбора выборки</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Событие: ожидание действия пользователя</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Ошибка регистрации обработчика событий.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Ошибка регистрации обработчика завершения.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Ошибка импорта данных погружения</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Невозможно создать контекст libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Невозможно открыть %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Нет прав, чтобы открыть устройство %s %s (%s)</translation>
     </message>
@@ -8089,7 +8110,7 @@ Maximum</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8098,70 +8119,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>Д: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>Т: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>С: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/мин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8170,7 +8191,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8179,170 +8200,170 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Ост. безопасности: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Ост. безопасности: неизв. время @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Деко: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Деко: неиз. время @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>В деко
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Деко: %uмин @ %.0f%s (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>В деко (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %uмин (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2ч (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %uмин (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2ч (вычисл.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Расчетный потолок %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Ткань %.0fмин: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>пульс: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>азимут: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>средная глубина здесь %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sГ:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sГ:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sС:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sС:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sД:%d %s</translation>
     </message>
@@ -8377,16 +8398,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 погружений)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 погружение)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>с лодки</translation>
@@ -8660,42 +8671,47 @@ EADD: %d%s
         <translation>более %d дней</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dд %dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>для погружений №</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>для выбранных погружений</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>для погружения №%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>для выбранного погружения</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>для всех погружений</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(нет погружений)</translation>
     </message>
@@ -8795,7 +8811,7 @@ EADD: %d%s
         <translation>Дек</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index 15a3ed87b..f048a306d 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Osoba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Vyhľadávanie partnerov a divemastrov</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Použiť</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Kliknutím sem vymažeš fľašu</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaša nemôže byť vymazaná</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Táto zmes sa používa. Len fľaše, ktoré nie sú použité pri ponore, môžu byť vymazané.</translation>
     </message>
@@ -1899,104 +1899,6 @@ vybraný počítač?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Dátum</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Hodnotenie</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Hĺbka(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Dĺžka (min)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Tepl(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Záťaž(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>US libra</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Oblek</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Fľaša</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Zmes</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Max. CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Miesto</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@ vybraný počítač?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation type="unfinished"/>
     </message>
@@ -2788,32 +2690,32 @@ vybraný počítač?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Cieľová hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Aktuálny čas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Použitá zmes</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3018,127 +2920,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Hodnotenie</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Hmotnosť</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Záťaž(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Oblek</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Fľaša</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Zmes</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Max. CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Hĺbka(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Tepl(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3530,7 +3432,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Miesto:</translation>
     </message>
@@ -3656,7 +3558,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation type="unfinished"/>
     </message>
@@ -3677,7 +3579,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -3987,6 +3889,26 @@ p, li { white-space: pre-wrap; }
         <translation>Pridať závažia</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Teplota vzduchu [%1]</translation>
@@ -4024,69 +3946,69 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Najhlbší ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Najplytší ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Najvyššia teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Najnižšia teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Priemerná teplota všetkých zvolených ponorov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Najdlhší ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Najkratší ponor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Priemerná dĺžka všetkých vybraných ponorov</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4095,22 +4017,22 @@ vytvorene zo vzduchu a:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>a</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Vymazať zmeny?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Chystáš sa vymazať zmeny.</translation>
     </message>
@@ -4263,7 +4185,7 @@ vytvorene zo vzduchu a:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Otvor</translation>
     </message>
@@ -4516,7 +4438,7 @@ vytvorene zo vzduchu a:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
@@ -4529,7 +4451,7 @@ vytvorene zo vzduchu a:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
@@ -4764,143 +4686,143 @@ vytvorene zo vzduchu a:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Otvoriť súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Zrušiť</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Ulož alebo zruš aktuálne editovanie ponoru pred zatvorením súboru.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Ulož alebo zruš aktuálne editovanie ponoru pred pridaním nového ponoru.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Vytlačiť runtime tabuľku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Chceš uložiť zmeny prevedené v súbore %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Chces uložiť zmeny prevedené v dátovom súbore?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Uložiť zmeny?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Uložiť súbor ako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Otvoriť log súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Zmeny budu stratené ak ich neuložíš.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Upozornenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Ulož alebo zruš aktuálne editovanie ponoru pred otvorením nového súboru.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Ročná štatistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Ukonči aktuálne editovanie pred tým než začneš ďalšie.</translation>
     </message>
@@ -4918,7 +4840,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter zobrazuje %1 (z %2) ponorov</translation>
     </message>
@@ -6034,12 +5956,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>Vzduch</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>KYSLÍK</translation>
     </message>
@@ -6079,42 +6001,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>US libra</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6582,7 +6515,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Obleky:</translation>
     </message>
@@ -6609,7 +6542,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Značky:</translation>
     </message>
@@ -6803,16 +6736,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6896,10 +6823,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Dátum</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Hodnotenie</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Hĺbka(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Dĺžka (min)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Tepl(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Záťaž(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>US libra</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Oblek</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Fľaša</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Zmes</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Max. CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Miesto</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -6997,8 +7019,8 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Neviem nájsť manuál</translation>
     </message>
@@ -7407,7 +7429,7 @@ Maximum</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7486,7 +7508,7 @@ Maximum</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) alebo (%s)</translation>
     </message>
@@ -7590,7 +7612,7 @@ Maximum</translation>
         <translation>Pre súbor &apos;%s&apos; nebol nájdený zodpovedajúci počítač</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>žiaden</translation>
     </message>
@@ -7598,7 +7620,7 @@ Maximum</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>dekompresná zastávka</translation>
     </message>
@@ -7611,7 +7633,7 @@ Maximum</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7619,45 +7641,45 @@ Maximum</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>výstup</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>strop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>záťaž</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>vysielač</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>prekročenie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>poznámka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>povrch</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>bezpečnostná zastávka</translation>
     </message>
@@ -7666,193 +7688,193 @@ Maximum</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>zmena plynu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>bezpečnostná zastávka (dobrovoľná)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>bezpečnostná zastávka (povinná)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>hĺbková zastávka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>strop (bezpečnostná zastávka)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>čas ponoru</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>pod stropom</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>max. hĺbka</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>čas na vzduchu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>smer</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>upozornenie nasýtenia tkanív</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>non stop čas</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>neplatné číslo udalosti</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Nie je možné spracovať %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Chyba registrácie dát</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Chyba spracovania času</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Ponor #%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Chyba spracovania času ponoru</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Chyba spracovania maximálnej hĺbky</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Chyba spracovania teploty</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Chyba spracovania dýchacích zmesí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Chyba získania slanosti vody</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Chyba pri zisťovaní tlaku na povrchu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Chyba načítania módu ponoru</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Chyba spracovania zmesi plynu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Chyba spracovania vzoriek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Udalosť: Čakanie na vstup uživateľa</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Chyba registrácia správcu udalosti.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Chyba registrácie správcu ukončenia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Chyba importu dát</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Problém inicializácie libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nie je možné otvoriť %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Nedostatočné privilégia na otvorenie zariadenia %s %s (%s)</translation>
     </message>
@@ -8070,7 +8092,7 @@ Maximum</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8079,70 +8101,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8151,7 +8173,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8160,166 +8182,166 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Bezpečnostná zastávka: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Bezpečnostná zastávka: neznáma @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: neznáma @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>In deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>V deco (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Vypočítaný strop %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Tkanivo %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>tep srdca: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>smer: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8354,16 +8376,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 ponorov)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 ponor)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>z lode</translation>
@@ -8637,42 +8649,47 @@ EADD: %d%s
         <translation>viac než %d dní</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>pre ponory</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>pre vybrané ponory</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>pre ponor #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>pre vybraný ponor</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>pre všetky ponory</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(žiadné ponory)</translation>
     </message>
@@ -8772,7 +8789,7 @@ EADD: %d%s
         <translation>Dec</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index f3781a465..b7edecd7f 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>Person:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Sök efter parkamrater och divemasters</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>Använd</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klicka här för att ta bort denna flaska</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Flaska kan inte tas bort</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <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>
@@ -1899,104 +1899,6 @@ radera den valda dykdatorn?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Rankning</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>Ljup(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Varaktighet</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>Temperatur(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>Vikt(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>pund</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Dräkt</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Cyl</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gas</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Max CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Plats</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/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 detta dyk.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>Skapa en ny dykplats med detta namn</translation>
     </message>
@@ -2788,32 +2690,32 @@ radera den valda dykdatorn?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Slutdjup</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Löptid</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Använd gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Rankning</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Temp</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Vikt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>Vikt(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Cyl</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>Ljup(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatur(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3536,7 +3438,7 @@ vänligen skicka följande till utvecklarna.
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Platts:</translation>
     </message>
@@ -3662,7 +3564,7 @@ vänligen skicka följande till utvecklarna.
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Dykplats administration</translation>
     </message>
@@ -3684,7 +3586,7 @@ vänligen skicka följande till utvecklarna.
 Är du säker att du vill fortsätta?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Du redigerar en dykplats</translation>
     </message>
@@ -3994,6 +3896,26 @@ vänligen skicka följande till utvecklarna.
         <translation>Lägg till viktsystem</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Lufttemperatur [%1]</translation>
@@ -4031,69 +3953,69 @@ vänligen skicka följande till utvecklarna.
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Djupaste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Grundaste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>Högsta totala SAC på ett dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Lägsta totala SAC på ett dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Genomsnittlig SAC av alla dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>Högsta templeratur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>Lägsta temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>Snitttemperatur på alla valda dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>Längsta dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>Kortaste dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>Genomsnittlig längd på alla valda dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4102,22 +4024,22 @@ mixas av luft och:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>och</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>Ny dykplats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Kassera ändringarna?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>Du är påväg att kasta bort dina förändringar</translation>
     </message>
@@ -4270,7 +4192,7 @@ mixas av luft och:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Öppna</translation>
     </message>
@@ -4523,7 +4445,7 @@ mixas av luft och:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>&amp;Ångra</translation>
     </message>
@@ -4536,7 +4458,7 @@ mixas av luft och:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>&amp;Gör om</translation>
     </message>
@@ -4771,144 +4693,144 @@ mixas av luft och:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Öppna fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>Traversera bild kataloger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>Sök</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Scannar bilder...(detta kan ta ett tag)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <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="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <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="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>Skriv ut körtidstabell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Försöker ändra ett dyk som inte är ett manuellt inlagt dyk.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <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="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <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="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Spara ändringar?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>Spara fil som</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[molnlatgring för] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>Öppnar datafil från en äldre version</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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 lära dig om förändringarna i den nya versionen, speciellt om dykplats administrationen som har ändrats signifikant.
 Subsurface har redan försökt att fylla i datat men det kan vara värt besväret att titta på den nya dykplats administrationen och se till att allt ser bra ut.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Öppna dyklogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Dyklogg filer (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;Alla filer (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>Kontaktar molntjänst...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <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="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Varning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <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="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Försöker planera om ett dyk som inte är en dykplan.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Årsstatistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <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>
@@ -4926,7 +4848,7 @@ Subsurface har redan försökt att fylla i datat men det kan vara värt besväre
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filter visar %1 (av %2) dyk</translation>
     </message>
@@ -6044,12 +5966,12 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>LUFT</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>OXYGEN</translation>
     </message>
@@ -6089,42 +6011,53 @@ Vänligen starta blåtand på din OSTC Sport och gör samma förberedelser som f
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>ft³</translation>
     </message>
@@ -6600,7 +6533,7 @@ Alla bilder har inte en tidstämpel mellan
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>Dräkter:</translation>
     </message>
@@ -6627,7 +6560,7 @@ Alla bilder har inte en tidstämpel mellan
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Taggar:</translation>
     </message>
@@ -6821,17 +6754,10 @@ Alla bilder har inte en tidstämpel mellan
         <translation>färg6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Vill du spara dina ändringar?</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>Du är på väg att modifiera en mall paketerad med Subsurface.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6915,10 +6841,105 @@ Alla bilder har inte en tidstämpel mellan
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation>(%1 visad)</translation>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Rankning</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>Ljup(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Varaktighet</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>Temperatur(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>Vikt(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>pund</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Dräkt</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Cyl</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gas</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Max CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Plats</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7016,8 +7037,8 @@ Alla bilder har inte en tidstämpel mellan
         <translation>Användarmanual</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Kan inte hitta Subsurface manualen</translation>
     </message>
@@ -7428,7 +7449,7 @@ Medel</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Misslyckades läsa sidhuvudet</translation>
     </message>
@@ -7507,7 +7528,7 @@ Medel</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) eller (%s)</translation>
     </message>
@@ -7611,7 +7632,7 @@ Medel</translation>
         <translation>Ingen matchande dykdator för filen &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>inget</translation>
     </message>
@@ -7619,7 +7640,7 @@ Medel</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>dekostopp</translation>
     </message>
@@ -7632,7 +7653,7 @@ Medel</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7640,45 +7661,45 @@ Medel</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>uppstigning</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>ceiling</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>arbetsbelastning</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>sändare</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>kränkning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>bokmärke</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>ytan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>säkerhetsstopp</translation>
     </message>
@@ -7687,193 +7708,193 @@ Medel</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>gasbyte</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>säkerhetsstopp (frivilligt)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>säkerhetsstopp (obligatoriskt)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>djupstopp</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (säkerhetsstopp)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>dyktid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <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="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>Maxdjup</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>gastid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>riktning</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>vävnadsnivå</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>non stop tid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>okänt händelsenummer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Kan inte skapa parser för %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Kunde inte registrera parser-data</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Kunde inte tolka tid och datum</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Dyk #%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Kunde inte tolka dyktid</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Kunde inte tolka maxdjup</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Misslyckas läsa temperatur</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Kunde inte tolka antal gasblandningar</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Kunde inte ladda vattnets salthalt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Kunde inte få tag i tyck vid ytan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Misslyckades läsa dykläge</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Kunde inte tolka gasblandning</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Kunde inte tolka sampel</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Händelse: väntar på användaren</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Kunde inte registrera event-funktion</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Kunde inte registrera avbrytningsrutin</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Lyckades inte importera dykdata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Kan inte skapa libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Kunde inte öppna fil %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Otillräckliga rättigheter för att öppna enheten %s %s (%s)</translation>
     </message>
@@ -8085,7 +8106,7 @@ Medel</translation>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8094,70 +8115,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8166,7 +8187,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8175,170 +8196,170 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Säkerhetsstopp: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Säkerhetsstopp: okänd tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deko: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deko: okänd tid @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>I Deko
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deko: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>I deko (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2h (beräknad)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2h (beräknad)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Beräknat tak %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Vävnad %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>hjärtrytm: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>kurs: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>medeldjup fram tills hit %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8373,16 +8394,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 dyk)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 dyk)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>båt</translation>
@@ -8656,42 +8667,47 @@ EADD: %d%s
         <translation>mer än %d dagar</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dt %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>för dykningar #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>för utvalda dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>Dyk #%d </translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>för valt dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>för alla dyk</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(inga dyk)</translation>
     </message>
@@ -8791,7 +8807,7 @@ EADD: %d%s
         <translation>dec</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts
index f46a28cf1..dfa65c229 100644
--- a/translations/subsurface_tr.ts
+++ b/translations/subsurface_tr.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -1714,17 +1714,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Buraya tıklayarak bu tüp kaldırılır.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Tüp kaldırılamaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1897,104 +1897,6 @@ kaldırmak istediğinizden emin misiniz?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Tarih</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Değerlendirme</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>fit</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Süre</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>libre</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>Gaz</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OZB</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>Azami MSS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Konum</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2095,12 +1997,12 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation type="unfinished"/>
     </message>
@@ -2786,32 +2688,32 @@ kaldırmak istediğinizden emin misiniz?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>bilinmeyen</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>Final derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>Çalışma süresi</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>Gaz kullanımı</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3016,127 +2918,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Tarih</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Değerlendirme</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Derinlik</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Ağırlık</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>fit</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>Azami MSS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Konum</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Süre</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>libre</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OZB</translation>
     </message>
@@ -3527,7 +3429,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>Konum:</translation>
     </message>
@@ -3653,7 +3555,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation type="unfinished"/>
     </message>
@@ -3674,7 +3576,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -3984,6 +3886,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>Hava sıcaklığı. [%1]</translation>
@@ -4021,91 +3943,91 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>Derin dalış</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>Sığ dalış</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>ve</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>Değişiklikleri silinsin mi ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -4258,7 +4180,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>Aç</translation>
     </message>
@@ -4511,7 +4433,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
@@ -4524,7 +4446,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
@@ -4759,143 +4681,143 @@ mixed from Air and using:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>Dosya aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Dosyayı kapatmadan önce geçerli dalışı düzenle, kaydet veya iptal et.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Bir dalış eklemeyi denemeden önce geçerli dalışı düzenle, kaydet veya iptal et.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>%1 dosyasında yapılan değişiklikleri kaydetmek istiyor musunuz?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Veri dosyasında yapılan değişiklikleri kaydetmek istiyor musunuz?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>Değişiklikler kaydedilsin mi ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>Dalış kayıt dosyasını aç</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>Uyarı</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Lütfen yeni bir dosya açmadan önce geçerli dalışı düzenle, kaydet veya iptal et.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>Yıllık istatistikler</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -4913,7 +4835,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -6029,12 +5951,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>HAVA</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
@@ -6074,42 +5996,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>dak</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>libre</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>fit</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>fitküp</translation>
     </message>
@@ -6580,7 +6513,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -6607,7 +6540,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>Etiketler:</translation>
     </message>
@@ -6801,16 +6734,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6894,10 +6821,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Tarih</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Değerlendirme</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>fit</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Süre</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>libre</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>Gaz</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OZB</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>Azami MSS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Konum</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -6995,8 +7017,8 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Subsurface kılavuzu bulunamadı</translation>
     </message>
@@ -7410,7 +7432,7 @@ Ortalama</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7489,7 +7511,7 @@ Ortalama</translation>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) veya (%s)</translation>
     </message>
@@ -7593,7 +7615,7 @@ Ortalama</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>hiçbiri</translation>
     </message>
@@ -7601,7 +7623,7 @@ Ortalama</translation>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation type="unfinished"/>
     </message>
@@ -7614,7 +7636,7 @@ Ortalama</translation>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>kdz</translation>
     </message>
@@ -7622,45 +7644,45 @@ Ortalama</translation>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>çıkış</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>tavan</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>iş yükü</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>yerimi</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>yüzey</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>güvenlik durağı</translation>
     </message>
@@ -7669,193 +7691,193 @@ Ortalama</translation>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>gazdeğişimi</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>güvenlik durağı (gönüllü)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>güvenlik durağı (zorunlu)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>Tavan (güvenlik durağı)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>dalış zamanı</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>azamiderinlik</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLB</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>igbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>doku seviye uyarısı</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>geçersiz olay numarası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Veri kaydedilirken hata</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Tarih saat ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Dalış zamanı ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Azami derinlik ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Gaz karışım sayısını ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Su tuzluluğu edinme hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Yüzey basıncı edinme hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Gaz karışımı ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Örnekleri ayrıştırma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Olay: kullanıcı eylemi bekleniyor</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), seri=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Olay işleyicisi kayıt hatası.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Dalış verisi içe aktarma hatası</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -8065,73 +8087,73 @@ Ortalama</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>MSS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8140,7 +8162,7 @@ EHYD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8149,154 +8171,154 @@ EHYD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %udak @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: bilinmeyen zaman @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>YZ: %udak
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>YZ: %udak (hesap)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
@@ -8331,16 +8353,6 @@ EHYD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>tekne</translation>
@@ -8614,42 +8626,47 @@ EHYD: %d%s
         <translation>%d günden fazla</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dg %ds %ddak</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%ds %ddak</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>dalışlar için #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>seçilen dalışlar için</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>dalış için #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>seçili dalışlar için</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>tüm dalışlar için</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(dalış yok)</translation>
     </message>
@@ -8749,7 +8766,7 @@ EHYD: %d%s
         <translation>Aralık</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts
index 72ad9d29c..bc7fc4f97 100644
--- a/translations/subsurface_vi.ts
+++ b/translations/subsurface_vi.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -1714,17 +1714,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <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="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>Xi lanh không thể được gỡ bỏ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <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>
@@ -1897,104 +1897,6 @@ bỏ các máy lặn đã được chọn?</translation>
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>Ngày tháng</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>Xếp hạng</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>Độ dài</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>ký</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>Đồ lặn</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>Xlanh</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/nhỏ nhất</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>Địa điểm</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2095,12 +1997,12 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation type="unfinished"/>
     </message>
@@ -2786,32 +2688,32 @@ bỏ các máy lặn đã được chọn?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3016,127 +2918,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>Xếp hạng</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>Nhiệt độ</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>Cân nặng</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>Đồ lặn</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>Xlanh</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -3526,7 +3428,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
@@ -3652,7 +3554,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation type="unfinished"/>
     </message>
@@ -3673,7 +3575,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation type="unfinished"/>
     </message>
@@ -3983,6 +3885,26 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
@@ -4020,91 +3942,91 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -4257,7 +4179,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation type="unfinished"/>
     </message>
@@ -4510,7 +4432,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation type="unfinished"/>
     </message>
@@ -4523,7 +4445,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation type="unfinished"/>
     </message>
@@ -4758,143 +4680,143 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
@@ -4912,7 +4834,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -6028,12 +5950,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>KHÔNG KHÍ</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
@@ -6073,42 +5995,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6576,7 +6509,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -6603,7 +6536,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -6797,16 +6730,10 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6890,10 +6817,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>Ngày tháng</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>Xếp hạng</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>Độ dài</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>ký</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>Đồ lặn</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>Xlanh</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/nhỏ nhất</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>Địa điểm</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -6991,8 +7013,8 @@ Not all images have timestamps in the range between
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"/>
     </message>
@@ -7393,7 +7415,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7472,7 +7494,7 @@ Maximum</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) hoặc (%s)</translation>
     </message>
@@ -7576,7 +7598,7 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>không</translation>
     </message>
@@ -7584,7 +7606,7 @@ Maximum</source>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>dừng lại deco</translation>
     </message>
@@ -7597,7 +7619,7 @@ Maximum</source>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
@@ -7605,45 +7627,45 @@ Maximum</source>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>đường dốc</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>trần</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>tải công việc</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>máy phát radio</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>độ xâm phạm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>đánh dấu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>bề mặt</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>dừng an toàn</translation>
     </message>
@@ -7652,193 +7674,193 @@ Maximum</source>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>thay đổi dưỡng khí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>dừng an toàn (tự nguyện)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>dừng an toàn (bắt buộc)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>trần (độ an toàn)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>thời gian lặn</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>độ sâu tối đa</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>thời gian không khí</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>thẳng tiến</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>cảnh báo cấp độ mô</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>không dừng lại thời gian</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>chỉ số sự kiện không hợp lệ</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <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="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Lỗi khi đăng ký dữ liệu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Lỗi khi chuyển thông số thời gian</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <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="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <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="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <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="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Lỗi khi thu nhận độ mặn của nước</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <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="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Lỗi khi chuyển thông số các mẫu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>Sự kiện: đang đợi thao tác từ người dùng</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>mô hình=%u (0x%08x), firmware=%u (0x%08x), số hiệu=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>Lỗi khi đăng ký quản lý sự kiện.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Lỗi khi đăng ký việc hủy bỏ quản lý.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>Lỗi khi nhập dữ liệu lặn</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <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="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Không thể mở %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -8049,225 +8071,225 @@ Maximum</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
@@ -8302,16 +8324,6 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>thuyền</translation>
@@ -8585,42 +8597,47 @@ EADD: %d%s
         <translation>đã hơn %d ngày</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>cho các lần lặn #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>cho các lần lặn được chọn</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>cho lần lặn #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>cho lần lặn được chọn</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>cho mọi lần lặn</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(không có cuộc lặn nào)</translation>
     </message>
@@ -8720,7 +8737,7 @@ EADD: %d%s
         <translation>Th12</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts
index e58605d44..af43958e5 100644
--- a/translations/subsurface_zh_TW.ts
+++ b/translations/subsurface_zh_TW.ts
@@ -258,12 +258,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
         <source>Person: </source>
         <translation>人名：</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="614"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
         <source>Searches for buddies and divemasters</source>
         <translation>搜尋潛伴與潛導</translation>
     </message>
@@ -1716,17 +1716,17 @@
         <translation>使用</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>於此處按下將移除此氣瓶.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
         <source>Cylinder cannot be removed</source>
         <translation>氣瓶無法移除</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>此氣瓶仍在使用中，在潛水中，只有未使用的氣瓶可被移除。</translation>
     </message>
@@ -1899,104 +1899,6 @@
     </message>
 </context>
 <context>
-    <name>DiveItem</name>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
-        <source>#</source>
-        <translation>#</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
-        <source>Date</source>
-        <translation>日期</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
-        <source>Rating</source>
-        <translation>評分</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>Depth(%1)</source>
-        <translation>深度(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>m</source>
-        <translation>m</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
-        <source>ft</source>
-        <translation>ft</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
-        <source>Duration</source>
-        <translation>區間</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
-        <source>Temp(%1%2)</source>
-        <translation>溫度(%1%2)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>Weight(%1)</source>
-        <translation>重量(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>kg</source>
-        <translation>kg</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
-        <source>lbs</source>
-        <translation>lbs</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
-        <source>Suit</source>
-        <translation>防寒衣</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
-        <source>Cyl</source>
-        <translation>氣瓶</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
-        <source>Gas</source>
-        <translation>氣體</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>SAC(%1)</source>
-        <translation>SAC(%1)</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
-        <source>/min</source>
-        <translation>/min</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
-        <source>OTU</source>
-        <translation>氧容許量 OTU</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
-        <source>Max CNS</source>
-        <translation>最大 CNS</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
-        <source>Location</source>
-        <translation>位置</translation>
-    </message>
-</context>
-<context>
     <name>DiveListView</name>
     <message>
         <location filename="../qt-ui/divelistview.cpp" line="845"/>
@@ -2097,12 +1999,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="323"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>建立新的潛點, 從潛水紀錄複製相關資訊. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="324"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
         <source>Create a new dive site with this name</source>
         <translation>以此名稱建立新的潛點</translation>
     </message>
@@ -2788,32 +2690,32 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="306"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
         <source>Final depth</source>
         <translation>最後深度</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="308"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
         <source>Run time</source>
         <translation>持續時間</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="310"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
         <source>Used gas</source>
         <translation>使用氣量</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
         <source>CC setpoint</source>
         <translation>CC 設定點</translation>
     </message>
@@ -3022,127 +2924,127 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="395"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="441"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="398"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="444"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="401"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="447"/>
         <source>Rating</source>
         <translation>評分</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="404"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="410"/>
         <source>Temp</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="413"/>
         <source>Weight</source>
         <translation>重量</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="425"/>
         <source>SAC</source>
         <translation>耗氣率</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>Weight(%1)</source>
         <translation>重量(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="416"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="462"/>
         <source>Suit</source>
         <translation>防寒衣</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="419"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="465"/>
         <source>Cyl</source>
         <translation>氣瓶</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="422"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="468"/>
         <source>Gas</source>
         <translation>氣體</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="473"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="431"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="479"/>
         <source>Max CNS</source>
         <translation>最大 CNS</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="482"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="450"/>
         <source>Depth(%1)</source>
         <translation>深度(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="407"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="453"/>
         <source>Duration</source>
         <translation>區間</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="456"/>
         <source>Temp(%1%2)</source>
         <translation>溫度(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="459"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
-        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="428"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="476"/>
         <source>OTU</source>
         <translation>氧容許量 OTU</translation>
     </message>
@@ -3536,7 +3438,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="640"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
         <source>Location: </source>
         <translation>位置：</translation>
     </message>
@@ -3662,7 +3564,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>潛點管理</translation>
     </message>
@@ -3684,7 +3586,7 @@ p, li { white-space: pre-wrap; }
 請注意是否要繼續? </translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="223"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>您正在編輯潛點</translation>
     </message>
@@ -3994,6 +3896,26 @@ p, li { white-space: pre-wrap; }
         <translation>新增配重系統</translation>
     </message>
     <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>OC</source>
+        <translation>OC</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>CCR</source>
+        <translation>CCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>pSCR</source>
+        <translation>pSCR</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <source>Freedive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../qt-ui/maintab.cpp" line="307"/>
         <source>Air temp. [%1]</source>
         <translation>氣溫 [%1]</translation>
@@ -4031,69 +3953,69 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="638"/>
         <location filename="../qt-ui/maintab.cpp" line="642"/>
         <location filename="../qt-ui/maintab.cpp" line="646"/>
+        <location filename="../qt-ui/maintab.cpp" line="650"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="635"/>
+        <location filename="../qt-ui/maintab.cpp" line="639"/>
         <source>Deepest dive</source>
         <translation>最深的潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="636"/>
+        <location filename="../qt-ui/maintab.cpp" line="640"/>
         <source>Shallowest dive</source>
         <translation>最淺的潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="649"/>
+        <location filename="../qt-ui/maintab.cpp" line="653"/>
         <source>Highest total SAC of a dive</source>
         <translation>潛水最高總SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../qt-ui/maintab.cpp" line="654"/>
         <source>Lowest total SAC of a dive</source>
         <translation>潛水最低總SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="651"/>
+        <location filename="../qt-ui/maintab.cpp" line="655"/>
         <source>Average total SAC of all selected dives</source>
         <translation>所選擇的潛水，平均總SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="662"/>
+        <location filename="../qt-ui/maintab.cpp" line="666"/>
         <source>Highest temperature</source>
         <translation>最高溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="663"/>
+        <location filename="../qt-ui/maintab.cpp" line="667"/>
         <source>Lowest temperature</source>
         <translation>最低溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="664"/>
+        <location filename="../qt-ui/maintab.cpp" line="668"/>
         <source>Average temperature of all selected dives</source>
         <translation>所選取潛水的平均溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="674"/>
+        <location filename="../qt-ui/maintab.cpp" line="678"/>
         <source>Longest dive</source>
         <translation>最長潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="675"/>
+        <location filename="../qt-ui/maintab.cpp" line="679"/>
         <source>Shortest dive</source>
         <translation>最短潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="676"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
         <source>Average length of all selected dives</source>
         <translation>所選取潛水的平均時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="700"/>
+        <location filename="../qt-ui/maintab.cpp" line="704"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4102,22 +4024,22 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../qt-ui/maintab.cpp" line="708"/>
         <source> and </source>
         <translation>與</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="834"/>
+        <location filename="../qt-ui/maintab.cpp" line="838"/>
         <source>New dive site</source>
         <translation>新的潛點</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1128"/>
+        <location filename="../qt-ui/maintab.cpp" line="1132"/>
         <source>Discard the changes?</source>
         <translation>取消變更？</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1129"/>
+        <location filename="../qt-ui/maintab.cpp" line="1133"/>
         <source>You are about to discard your changes.</source>
         <translation>您將要放棄您的變更。</translation>
     </message>
@@ -4270,7 +4192,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="171"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="362"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
         <source>Open</source>
         <translation>開啟</translation>
     </message>
@@ -4523,7 +4445,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="698"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
         <source>&amp;Undo</source>
         <translation>復原</translation>
     </message>
@@ -4536,7 +4458,7 @@ mixed from Air and using:
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="706"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="227"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
         <source>&amp;Redo</source>
         <translation>取消還原</translation>
     </message>
@@ -4771,144 +4693,144 @@ mixed from Air and using:
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="359"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
         <source>Open file</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="363"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="468"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="464"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
         <source>Traverse image directories</source>
         <translation>經過照片路徑</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
         <source>Scan</source>
         <translation>掃描</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="475"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>掃描影像...(需要稍待一段時間)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="528"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>在關閉檔案前，請儲存或取消此次潛水的編輯。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>在新增潛水前，請先儲存或取消此次潛水的編輯。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Print runtime table</source>
         <translation>列印操作表格</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>嘗試編輯非手動建立的潛水記錄. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1060"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>您是否要對檔案 %1 所做的修改儲存? </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1063"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>您是否要對資料檔案所做的修改進行儲存? </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1068"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
         <source>Save changes?</source>
         <translation>儲存變更? </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1435"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
         <source>Save file as</source>
         <translation>另存新檔</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1530"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
         <source>[cloud storage for] %1</source>
         <translation>[雲端裝置] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1630"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
         <source>Opening datafile from older version</source>
         <translation>從較舊的版本中開啟資料檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1631"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
         <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>自舊版的 Subsurface 開啟資料檔案. 建議請先在新版程式中, 閱讀相關變更, 特別是有關潛點管理的部分. 
 Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛點管理系統, 並確認資料是否正確. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1642"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
         <source>Open dive log file</source>
         <translation>打開潛水日誌檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1643"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
         <translation>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1853"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
         <source>Contacting cloud service...</source>
         <translation>聯絡雲端服務...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1069"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>如果不進行儲存，所做變更將會遺失。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="503"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="646"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="802"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Warning</source>
         <translation>提醒</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="353"/>
         <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1408"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>在開啟新檔前，請儲存或取消此次潛水的編輯。</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="725"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>嘗試針對非原計畫的潛水進行重新規畫. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
         <source>Yearly statistics</source>
         <translation>年統計</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1436"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="796"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1688"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>請在嘗試其他編輯時先完成當前編輯</translation>
     </message>
@@ -4926,7 +4848,7 @@ Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛�
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="725"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>過濾器顯示 %1 (of %2) 潛水</translation>
     </message>
@@ -6044,12 +5966,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>AIR</source>
         <translation>空氣</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1255"/>
+        <location filename="../qthelper.cpp" line="1310"/>
         <source>OXYGEN</source>
         <translation>OXYGEN</translation>
     </message>
@@ -6089,42 +6011,53 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1269"/>
+        <location filename="../qthelper.cpp" line="1072"/>
+        <location filename="../qthelper.cpp" line="1074"/>
+        <source>(%1 dives)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1077"/>
+        <source>(1 dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="1324"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1270"/>
+        <location filename="../qthelper.cpp" line="1325"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1293"/>
+        <location filename="../qthelper.cpp" line="1348"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1294"/>
+        <location filename="../qthelper.cpp" line="1349"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1316"/>
+        <location filename="../qthelper.cpp" line="1371"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1317"/>
+        <location filename="../qthelper.cpp" line="1372"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1339"/>
+        <location filename="../qthelper.cpp" line="1394"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1340"/>
+        <location filename="../qthelper.cpp" line="1395"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
@@ -6600,7 +6533,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="666"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
         <source>Suits: </source>
         <translation>潛水衣: </translation>
     </message>
@@ -6627,7 +6560,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="587"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
         <source>Tags: </source>
         <translation>標籤:</translation>
     </message>
@@ -6821,17 +6754,10 @@ Not all images have timestamps in the range between
         <translation>顏色 6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="135"/>
+        <location filename="../qt-ui/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>是否要儲存設定? </translation>
     </message>
-    <message>
-        <location filename="../qt-ui/templateedit.cpp" line="140"/>
-        <source>You are about to modify a template bundled with Subsurface.
-</source>
-        <translation>您正在修改 Subsurface 設定的樣板.
-</translation>
-    </message>
 </context>
 <context>
     <name>TestParse</name>
@@ -6915,10 +6841,105 @@ Not all images have timestamps in the range between
 <context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="67"/>
         <source>(%1 shown)</source>
         <translation>(%1 顯示)</translation>
     </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+        <source>Date</source>
+        <translation>日期</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+        <source>Rating</source>
+        <translation>評分</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>Depth(%1)</source>
+        <translation>深度(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+        <source>Duration</source>
+        <translation>區間</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+        <source>Temp(%1%2)</source>
+        <translation>溫度(%1%2)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>Weight(%1)</source>
+        <translation>重量(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+        <source>lbs</source>
+        <translation>lbs</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+        <source>Suit</source>
+        <translation>防寒衣</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+        <source>Cyl</source>
+        <translation>氣瓶</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+        <source>Gas</source>
+        <translation>氣體</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>SAC(%1)</source>
+        <translation>SAC(%1)</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+        <source>/min</source>
+        <translation>/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+        <source>OTU</source>
+        <translation>氧容許量 OTU</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+        <source>Max CNS</source>
+        <translation>最大 CNS</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+        <source>Location</source>
+        <translation>位置</translation>
+    </message>
 </context>
 <context>
     <name>URLDialog</name>
@@ -7016,8 +7037,8 @@ Not all images have timestamps in the range between
         <translation>使用者說明</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="71"/>
-        <location filename="../qt-ui/usermanual.cpp" line="77"/>
+        <location filename="../qt-ui/usermanual.cpp" line="74"/>
+        <location filename="../qt-ui/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>無法找到 Subsurface 使用說明</translation>
     </message>
@@ -7432,7 +7453,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="641"/>
+        <location filename="../libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>檔頭解析錯誤</translation>
     </message>
@@ -7511,7 +7532,7 @@ Maximum</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1579"/>
+        <location filename="../dive.c" line="1580"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) 或 (%s)</translation>
     </message>
@@ -7615,7 +7636,7 @@ Maximum</source>
         <translation>檔案 &apos;%s&apos; 尋無匹配的 DC</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>none</source>
         <translation>無</translation>
     </message>
@@ -7623,7 +7644,7 @@ Maximum</source>
         <location filename="../cochran.c" line="306"/>
         <location filename="../cochran.c" line="312"/>
         <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>deco stop</source>
         <translation>減壓停留</translation>
     </message>
@@ -7636,7 +7657,7 @@ Maximum</source>
     <message>
         <location filename="../cochran.c" line="367"/>
         <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>rbt</source>
         <translation>剩餘滯底時間</translation>
     </message>
@@ -7644,45 +7665,45 @@ Maximum</source>
         <location filename="../cochran.c" line="333"/>
         <location filename="../cochran.c" line="387"/>
         <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ascent</source>
         <translation>上升</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="376"/>
         <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>ceiling</source>
         <translation>上限深度</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="165"/>
+        <location filename="../libdivecomputer.c" line="198"/>
         <source>workload</source>
         <translation>工作量</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>transmitter</source>
         <translation>發射器</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>violation</source>
         <translation>違反</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>bookmark</source>
         <translation>書籤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>surface</source>
         <translation>水面</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="166"/>
+        <location filename="../libdivecomputer.c" line="199"/>
         <source>safety stop</source>
         <translation>安全停留</translation>
     </message>
@@ -7691,193 +7712,193 @@ Maximum</source>
         <location filename="../cochran.c" line="411"/>
         <location filename="../cochran.c" line="418"/>
         <location filename="../file.c" line="812"/>
-        <location filename="../libdivecomputer.c" line="167"/>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>gaschange</source>
         <translation>氣瓶更換</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (voluntary)</source>
         <translation>安全停留 (非必要)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="200"/>
         <source>safety stop (mandatory)</source>
         <translation>安全停留 (強制性)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>deepstop</source>
         <translation>深停留</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>ceiling (safety stop)</source>
         <translation>上限深度 (安全停留)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>divetime</source>
         <translation>潛水時間</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="168"/>
+        <location filename="../libdivecomputer.c" line="201"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>below floor</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>maxdepth</source>
         <translation>最大深度</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>airtime</source>
         <translation>空氣時間</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>heading</source>
         <translation>標題</translation>
     </message>
     <message>
         <location filename="../cochran.c" line="355"/>
         <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="169"/>
+        <location filename="../libdivecomputer.c" line="202"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>tissue level warning</source>
         <translation>組織等級警告</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="170"/>
+        <location filename="../libdivecomputer.c" line="203"/>
         <source>non stop time</source>
         <translation>無停留時間</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
+        <location filename="../libdivecomputer.c" line="220"/>
         <source>invalid event number</source>
         <translation>錯誤的事件編號</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="625"/>
+        <location filename="../libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>無法建立解析 %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="631"/>
+        <location filename="../libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>錯誤的登錄資料</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="462"/>
+        <location filename="../libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>日期時間解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="480"/>
+        <location filename="../libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>潛水 %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="486"/>
+        <location filename="../libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>潛水時間解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="496"/>
+        <location filename="../libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>最大深度解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>錯誤溫度解析</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="535"/>
+        <location filename="../libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>混合氣體數量解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="547"/>
+        <location filename="../libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>得到錯誤的海水鹽度</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="556"/>
+        <location filename="../libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>得到錯誤的水面壓力</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="581"/>
+        <location filename="../libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>錯誤潛水模式取得</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="601"/>
+        <location filename="../libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>混合氣體解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="651"/>
+        <location filename="../libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>樣本解析錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="788"/>
+        <location filename="../libdivecomputer.c" line="821"/>
         <source>Event: waiting for user action</source>
         <translation>事件: 等待使用者動作</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="796"/>
+        <location filename="../libdivecomputer.c" line="829"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>型號=%u (0x%08x), 韌體=%u (0x%08x), 序號=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="860"/>
+        <location filename="../libdivecomputer.c" line="893"/>
         <source>Error registering the event handler.</source>
         <translation>錯誤的註冊程序.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="898"/>
         <source>Error registering the cancellation handler.</source>
         <translation>錯誤的註冊取消程序.</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="886"/>
+        <location filename="../libdivecomputer.c" line="919"/>
         <source>Dive data import error</source>
         <translation>匯入潛水資料錯誤</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="925"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>無法建立 libdivecomputer 上下文</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="932"/>
+        <location filename="../libdivecomputer.c" line="965"/>
         <source>Unable to open %s %s (%s)</source>
         <translation> 無法開啟 %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="956"/>
+        <location filename="../libdivecomputer.c" line="989"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>無權限開啟裝置 %s %s (%s)</translation>
     </message>
@@ -8089,7 +8110,7 @@ Maximum</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1126"/>
+        <location filename="../profile.c" line="1133"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8098,63 +8119,63 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1129"/>
+        <location filename="../profile.c" line="1136"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../profile.c" line="1140"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1139"/>
+        <location filename="../profile.c" line="1146"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1142"/>
+        <location filename="../profile.c" line="1149"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1144"/>
+        <location filename="../profile.c" line="1151"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../profile.c" line="1153"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1148"/>
+        <location filename="../profile.c" line="1155"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1150"/>
+        <location filename="../profile.c" line="1157"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../profile.c" line="1160"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../profile.c" line="1167"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8163,7 +8184,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1164"/>
+        <location filename="../profile.c" line="1171"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8172,168 +8193,168 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1176"/>
+        <location filename="../profile.c" line="1184"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>安全停留: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1179"/>
+        <location filename="../profile.c" line="1187"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>安全停留: 未知時間 @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../profile.c" line="1192"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %umin @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../profile.c" line="1195"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>減壓: 未知時間 @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1191"/>
+        <location filename="../profile.c" line="1199"/>
         <source>In deco
 </source>
         <translation>減壓中
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1193"/>
+        <location filename="../profile.c" line="1201"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1196"/>
+        <location filename="../profile.c" line="1204"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1207"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>減壓: %umin @ %.0f%s (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../profile.c" line="1215"/>
         <source>In deco (calc)
 </source>
         <translation>減壓 (計算)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1210"/>
+        <location filename="../profile.c" line="1218"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL:%umin (預計)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1212"/>
+        <location filename="../profile.c" line="1220"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1224"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %umin (calc)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../profile.c" line="1226"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1221"/>
+        <location filename="../profile.c" line="1229"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %umin
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../profile.c" line="1232"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>計算的上限深度 %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1230"/>
+        <location filename="../profile.c" line="1238"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>組織 %.0fmin: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1236"/>
+        <location filename="../profile.c" line="1244"/>
         <source>heartbeat: %d
 </source>
         <translation>心跳: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../profile.c" line="1246"/>
         <source>bearing: %d
 </source>
         <translation>方位: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1241"/>
+        <location filename="../profile.c" line="1249"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>至此的平均深度 %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1336"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1340"/>
-        <location filename="../profile.c" line="1344"/>
         <location filename="../profile.c" line="1348"/>
+        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1356"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1352"/>
+        <location filename="../profile.c" line="1360"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../profile.c" line="1364"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../profile.c" line="1368"/>
+        <location filename="../profile.c" line="1372"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1371"/>
+        <location filename="../profile.c" line="1379"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
@@ -8368,16 +8389,6 @@ EADD: %d%s
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1019"/>
-        <source>%1 %2 (%3 dives)</source>
-        <translation>%1 %2 (%3 潛水)</translation>
-    </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1024"/>
-        <source>%1 %2 (1 dive)</source>
-        <translation>%1 %2 (1 潛水)</translation>
-    </message>
-    <message>
         <location filename="../dive.c" line="23"/>
         <source>boat</source>
         <translation>船潛</translation>
@@ -8651,42 +8662,47 @@ EADD: %d%s
         <translation>超過 %d日</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="220"/>
+        <location filename="../statistics.c" line="221"/>
         <source>%dd %dh %dmin</source>
         <translation>%dd %dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="222"/>
+        <location filename="../statistics.c" line="224"/>
+        <source>%dmin %dsecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../statistics.c" line="226"/>
         <source>%dh %dmin</source>
         <translation>%dh %dmin</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="234"/>
+        <location filename="../statistics.c" line="238"/>
         <source>for dives #</source>
         <translation>針對潛水 #</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="240"/>
+        <location filename="../statistics.c" line="244"/>
         <source>for selected dives</source>
         <translation>針對選擇的潛水</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="275"/>
+        <location filename="../statistics.c" line="279"/>
         <source>for dive #%d</source>
         <translation>針對潛水 #%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="277"/>
+        <location filename="../statistics.c" line="281"/>
         <source>for selected dive</source>
         <translation>針對選擇的潛水</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../statistics.c" line="283"/>
         <source>for all dives</source>
         <translation>針對所有潛水</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../statistics.c" line="285"/>
         <source>(no dives)</source>
         <translation>(無潛水)</translation>
     </message>
@@ -8786,7 +8802,7 @@ EADD: %d%s
         <translation>12月</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <location filename="../parse-xml.c" line="3177"/>
         <location filename="../uemis-downloader.c" line="133"/>
         <source>unknown</source>
author	Dirk Hohndel <dirk@hohndel.org>	2015-10-27 15:23:39 +0900
committer	Dirk Hohndel <dirk@hohndel.org>	2015-10-27 15:23:39 +0900
commit	5b08705f39becbe794f3e140213ce4932b49b7c9 (patch)
tree	03a1f2ff6441b0e49c18d7c7c901504360eee8b2 /translations
parent	3b419b3d075be3ab66d23c49c5ad76be5075d37b (diff)
download	subsurface-5b08705f39becbe794f3e140213ce4932b49b7c9.tar.gz